git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'adminbsb_material_ui'

Browse Source
This commit is contained in:
Aung Myo
2018-04-02 11:44:11 +06:30
parent d1a62948e9 e6d11644bb
commit 1cb6701055
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/addorder.js
View File

@@ -381,16 +381,18 @@ $(function() {
item = get_set_item(items); item = get_set_item(items);
customer_display_view(item,"set_add"); customer_display_view(item,"set_add");
var option = '' var option = []
attribute_arr = [] attribute_arr = []
var rowCount = $('.summary-items tbody tr').length+1; var rowCount = $('.summary-items tbody tr').length+1;
code = $('.set-item').attr('data-code'); code = $('.set-item').attr('data-code');
name = $('.set-item').attr('data-name'); name = $('.set-item').attr('data-name');
price = $('.set-item').attr('data-price'); price = $('.set-item').attr('data-price');
option = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options'); option_name = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options');
option = ($('.set-item').attr('data-options') === '') ? '[]' :$('.set-item').attr('data-options');
parent = $('.set-item').attr('data-parent'); parent = $('.set-item').attr('data-parent');
total = qty * price ; total = qty * price ;
row ="<tr class='item_box' data-price ='" row ="<tr class='item_box' data-price ='"
+price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='" +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
+name+ "' data-code='"+item_code+"' data-instance-code='" +name+ "' data-code='"+item_code+"' data-instance-code='"
@@ -398,7 +400,7 @@ $(function() {
+attribute_arr+"' data-options ='" +attribute_arr+"' data-options ='"
+option+"' data-row ='"+rowCount+ "' data-parent ='"+parent+ "'>" +option+"' data-row ='"+rowCount+ "' data-parent ='"+parent+ "'>"
+'<td class="item-cell-no">'+rowCount+'</td>' +'<td class="item-cell-no">'+rowCount+'</td>'
+'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + option +'</td>' +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + option_name +'</td>'
+'<td class="item-cell-qty" id="item_qty">' + qty + '</td>' +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+'<td class="item-cell-price" id="item_price">' +'<td class="item-cell-price" id="item_price">'
+ parseFloat(total).toFixed(2) + parseFloat(total).toFixed(2)
@@ -406,15 +408,16 @@ $(function() {
+'</tr>'; +'</tr>';
$(".summary-items tbody").append(row); $(".summary-items tbody").append(row);
var rowCount = $('.summary-items tbody tr').length+1; var rowCount = $('.summary-items tbody tr').length+1;
var set_option = '' var set_option = []
$(items).each(function(i){ $(items).each(function(i){
code = $(items[i]).attr('data-code'); code = $(items[i]).attr('data-code');
name = $(items[i]).attr('data-name'); name = $(items[i]).attr('data-name');
price = $(items[i]).attr('data-price'); price = $(items[i]).attr('data-price');
set_option = ($(items[i]).attr('data-options') === 'undefined') ? ' ' :$(items[i]).attr('data-options'); set_option_name = ($(items[i]).attr('data-options') === 'undefined') ? ' ' :$(items[i]).attr('data-options');
set_option= ($(items[i]).attr('data-options') === '') ? '[]' :$(items[i]).attr('data-options');
sub_item = $(items[i]).attr('data-sub-item'); sub_item = $(items[i]).attr('data-sub-item');
total = qty * price ; total = qty * price ;
row ="<tr class='item_box' data-price ='" row ="<tr class='item_box' data-price ='"
+price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='" +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
+name+ "' data-code='"+item_code+"' data-instance-code='" +name+ "' data-code='"+item_code+"' data-instance-code='"
@@ -422,7 +425,7 @@ $(function() {
+attribute_arr+"' data-options ='" +attribute_arr+"' data-options ='"
+set_option+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>" +set_option+"' data-row ='"+rowCount+ "' data-sub-item ='"+sub_item+ "'>"
+'<td class="item-cell-no">'+rowCount+'</td>' +'<td class="item-cell-no">'+rowCount+'</td>'
+'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + set_option +'</td>' +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +' ' + set_option_name +'</td>'
+'<td class="item-cell-qty" id="item_qty">' + qty + '</td>' +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+'<td class="item-cell-price" id="item_price">' +'<td class="item-cell-price" id="item_price">'
+ parseFloat(total).toFixed(2) + parseFloat(total).toFixed(2)