diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 47c6cd4f..31209c99 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -381,16 +381,18 @@ $(function() {
item = get_set_item(items);
customer_display_view(item,"set_add");
- var option = ''
+ var option = []
attribute_arr = []
var rowCount = $('.summary-items tbody tr').length+1;
code = $('.set-item').attr('data-code');
name = $('.set-item').attr('data-name');
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');
total = qty * price ;
+
row ="
"
+'| '+rowCount+' | '
- +'' + item_name+ ' ' + name +' ' + option +' | '
+ +'' + item_name+ ' ' + name +' ' + option_name +' | '
+'' + qty + ' | '
+''
+ parseFloat(total).toFixed(2)
@@ -406,15 +408,16 @@ $(function() {
+' |
';
$(".summary-items tbody").append(row);
var rowCount = $('.summary-items tbody tr').length+1;
- var set_option = ''
+ var set_option = []
$(items).each(function(i){
code = $(items[i]).attr('data-code');
name = $(items[i]).attr('data-name');
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');
total = qty * price ;
+
row =""
+'| '+rowCount+' | '
- +'' + item_name+ ' ' + name +' ' + set_option +' | '
+ +'' + item_name+ ' ' + name +' ' + set_option_name +' | '
+'' + qty + ' | '
+''
+ parseFloat(total).toFixed(2)
|