Проброс в шаблон Basket-ячейки функции форматирования даты

parent 3e772f8c
...@@ -20,7 +20,7 @@ $(document).ready(function(){ ...@@ -20,7 +20,7 @@ $(document).ready(function(){
' <tr> \n' + ' <tr> \n' +
' <td><a class="basket-link" href="<%=item.URL %>" target="_blank"><%=item.Title %></a></td> \n' + ' <td><a class="basket-link" href="<%=item.URL %>" target="_blank"><%=item.Title %></a></td> \n' +
' <td><span class="quantity"><%=item.Quantity %></span></td> \n' + ' <td><span class="quantity"><%=item.Quantity %></span></td> \n' +
' <td><span class="price"><%=item.Price %></span></td> \n' + ' <td><span class="price"><%=formatPrice(item.Price) %></span></td> \n' +
' </tr> \n' + ' </tr> \n' +
' <% }) %> \n' + ' <% }) %> \n' +
' </tbody> \n' + ' </tbody> \n' +
...@@ -120,13 +120,8 @@ $(document).ready(function(){ ...@@ -120,13 +120,8 @@ $(document).ready(function(){
activeLines.forEach(function(line){ activeLines.forEach(function(line){
if (line == 'Basket') { if (line == 'Basket') {
var dataBasket = item[line]; var dataBasket = item[line];
//currentActiveLine = 'Price'; currentActiveLine = 'Price';
currentActiveLine = line; $row.append($('<td class="'+ line +'">').append(templateBasketContent({data: dataBasket, formatPrice: valueFormat})));
dataBasket.forEach(function(dataBasketItem, ind){
dataBasket[ind]['Price'] = valueFormat(dataBasketItem['Price']);
});
//console.log('AAA dataBasket = ', dataBasket);
$row.append($('<td class="'+ line +'">').append(templateBasketContent({data: dataBasket})));
} else if (line == 'Timestamp') { } else if (line == 'Timestamp') {
var var
dateTimeValue = item[line].split(' '), dateTimeValue = item[line].split(' '),
...@@ -165,10 +160,7 @@ $(document).ready(function(){ ...@@ -165,10 +160,7 @@ $(document).ready(function(){
if (item == 'Basket') { if (item == 'Basket') {
var dataBasket = values[item]; var dataBasket = values[item];
currentActiveLine = 'Price'; currentActiveLine = 'Price';
dataBasket.forEach(function(dataBasketItem, ind){ $row.append($('<td class="'+ item +'">').append(templateBasketContent({data: dataBasket, formatPrice: valueFormat})));
dataBasket[ind]['Price'] = valueFormat(dataBasketItem['Price']);
});
$row.append($('<td class="'+ item +'">').append(templateBasketContent({data: dataBasket})));
} else if (item == 'Timestamp') { } else if (item == 'Timestamp') {
var var
dateTimeValue = values[item].split(' '), dateTimeValue = values[item].split(' '),
...@@ -187,8 +179,8 @@ $(document).ready(function(){ ...@@ -187,8 +179,8 @@ $(document).ready(function(){
} }
} }
// Добавляем строку "Итого": // Добавляем строку "Итого" для отчета 'common':
if (dataLineChartStat.report != 'transaction') { if (dataLineChartStat.report == 'common') {
$row = $('<tr style="font-weight: bold;">'); $row = $('<tr style="font-weight: bold;">');
$row.append($('<td>').html("Итого")); $row.append($('<td>').html("Итого"));
...@@ -212,7 +204,7 @@ $(document).ready(function(){ ...@@ -212,7 +204,7 @@ $(document).ready(function(){
} }
// Добавляем строку "Всего заказов": // Добавляем строку "Всего заказов" для отчета 'transaction':
if (dataLineChartStat.report == 'transaction') { if (dataLineChartStat.report == 'transaction') {
$row = $('<tr class="total-orders" style="">'); $row = $('<tr class="total-orders" style="">');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment