Merge branch 'adminbsb_material_ui'

app/assets/javascripts/addorder.js

@@ -206,6 +206,7 @@ $(function() {
       $('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]);
 
       value = item_sets[field]["instances"];
+
       $(value).each(function(i){
         $.ajax({
           type: "GET",
@@ -241,6 +242,11 @@ $(function() {
       });
     }
 
+     $('.set-item').attr('data-code',instances[0]['code']);
+     $('.set-item').attr('data-name',instances[0]['name']);
+     $('.set-item').attr('data-price',instances[0]['price']);
+     $('.set-item').attr('data-options','[]');
+
     $('#set_change_qty').val(1);
     $('#set_item_instances').text(instances);
     $('#set_name').text(data.attr('data-name'));
@@ -313,6 +319,8 @@ $(function() {
     item_name     = $('#set_name').text();
     min_qty       = $(this).data('min-qty');
 
+    default_instance = $('.set-item');
+
     var items  = $('.selected-instance');
 
     if (items.length >= min_qty) {
@@ -342,6 +350,29 @@ $(function() {
           $(".summary-items tbody").append(row);
         rowCount = rowCount + 1;
       });
+
+      var rowCount = $('.summary-items tbody tr').length+1;
+      option_arr = []
+        code          = $('.set-item').attr('data-code');
+        name          = $('.set-item').attr('data-name');
+        price         = $('.set-item').attr('data-price');
+        option        = $('.set-item').attr('data-options');
+        total         = qty * price ;
+        option_arr.push(option);
+        row ="<tr class='item_box' data-price ='"
+              +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
+              +name+ "' data-code='"+item_code+"' data-instance-code='"
+              +code+"' data-attributes='"
+              +attribute_arr+"' data-options ='"
+              +option_arr+"' data-row ='"+rowCount+ "'>"
+          +'<td class="item-cell-no">'+rowCount+'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +'</td>'
+          +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+          +'<td class="item-cell-price" id="item_price">' 
+          + parseFloat(total).toFixed(2)
+          +'</td>' 
+          +'</tr>';
+          $(".summary-items tbody").append(row);
       calculate_sub_total();
       $(".sx_item_set_detailModal").css({ 'display': "none" });
     }else{

app/pdf/order_item_pdf.rb

@@ -92,7 +92,7 @@ class OrderItemPdf < Prawn::Document
     move_down 5
 
     bounding_box([0,y_position], :width => self.item_width) do
-        text "#{order_item.item_name}", :size => self.item_font_size,:align => :left
+        text "#{order_item.item_code} - #{order_item.item_name}", :size => self.item_font_size,:align => :left
     end
 
     bounding_box([self.item_width,y_position], :width => self.qty_width) do
@@ -100,7 +100,7 @@ class OrderItemPdf < Prawn::Document
     end
 
     bounding_box([0,y_position], :width => self.item_width) do
-      text "#{order_item.item_name}", :size => self.item_font_size,:align => :left
+      text "#{order_item.item_code} - #{order_item.item_name}", :size => self.item_font_size,:align => :left
 
     end
 

app/pdf/order_summary_pdf.rb

@@ -108,7 +108,7 @@ class OrderSummaryPdf < Prawn::Document
         y_position = cursor
 
         bounding_box([0,y_position], :width => self.item_width) do
-          text "#{odi.item_name}", :size => self.item_font_size,:align => :left
+          text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
 
         end
 
@@ -117,7 +117,7 @@ class OrderSummaryPdf < Prawn::Document
         end
 
         bounding_box([0,y_position], :width => self.item_width) do
-          text "#{odi.item_name}", :size => self.item_font_size,:align => :left
+          text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
 
         end