From 3b8a5183577c63dde12587548761782ac22e9e78 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 18 Aug 2017 19:09:09 +0630
Subject: [PATCH] update addorder

---
 .../restaurant/menu/_menu_item.json.jbuilder  |  14 +-
 .../menu_categories/show.json.jbuilder        |  61 ++++----
 app/views/origami/addorders/show.html.erb     | 141 ++++++++++++------
 3 files changed, 132 insertions(+), 84 deletions(-)

diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
index ffad3dc2..6446169f 100644
--- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
@@ -28,13 +28,13 @@ json.options item.item_options
 
 # elsif item.menu_item_instances.count > 1 then
   json.instances item.menu_item_instances do |is|
-    json.code = is.item_instance_code
-    json.name = is.item_instance_name
-    json.price = is.price
-    json.is_available = is.is_available
-    json.is_on_promotion = is.is_on_promotion
-    json.promotion_price = is.promotion_price
-    json.item_attributes = is.item_attributes
+    json.code  is.item_instance_code
+    json.name  is.item_instance_name
+    json.price  is.price
+    json.is_available  is.is_available
+    json.is_on_promotion  is.is_on_promotion
+    json.promotion_price  is.promotion_price
+    json.item_attributes  is.item_attributes
   # end
 
 end
diff --git a/app/views/api/restaurant/menu_categories/show.json.jbuilder b/app/views/api/restaurant/menu_categories/show.json.jbuilder
index f48f6c77..ad05acbf 100644
--- a/app/views/api/restaurant/menu_categories/show.json.jbuilder
+++ b/app/views/api/restaurant/menu_categories/show.json.jbuilder
@@ -1,43 +1,48 @@
 if @menu.menu_items
     json.menu_items @menu.menu_items do |item|
         #Menu Item Information
-		json.item_code item.item_code
-		json.name item.name
-		json.alt_name item.alt_name
-		json.type     item.type
-		json.min_qty  item.min_qty
+		# json.item_code item.item_code
+		# json.name item.name
+		# json.alt_name item.alt_name
+		# json.type     item.type
+		# json.min_qty  item.min_qty
 		# json.min_selectable_item item.min_selectable_item
 		# json.max_selectable_item item.max_selectable_item
 
 		#Item instance
-		if item.menu_item_instances.count == 1 then
+		# if item.menu_item_instances.count == 1 then
 
-		  item_instance = item.menu_item_instances[0]
-		  json.price  item_instance.price
-		  json.is_available  item_instance.is_available
-		  json.is_on_promotion  item_instance.is_on_promotion
-		  json.promotion_price  item_instance.promotion_price
-		  json.item_attributes  item_instance.item_attributes
+		#   item_instance = item.menu_item_instances[0]
+		#   json.price  item_instance.price
+		#   json.is_available  item_instance.is_available
+		#   json.is_on_promotion  item_instance.is_on_promotion
+		#   json.promotion_price  item_instance.promotion_price
+		#   json.item_attributes  item_instance.item_attributes
 
-		elsif item.menu_item_instances.count > 1 then
+		# elsif item.menu_item_instances.count > 1 then
 
-		  json.item_instances item.menu_item_instances do |is|
-		    json.item_instance_item_code  is.item_instance_code
-		    json.item_instance_name  is.item_instance_name
-		    json.price  is.price
-		    json.is_available  is.is_available
-		    json.is_on_promotion  is.is_on_promotion
-		    json.promotion_price  is.promotion_price
-		    json.item_attributes  is.item_attributes
-		  end
+		#   json.item_instances item.menu_item_instances do |is|
+		#     json.item_instance_item_code  is.item_instance_code
+		#     json.item_instance_name  is.item_instance_name
+		#     json.price  is.price
+		#     json.is_available  is.is_available
+		#     json.is_on_promotion  is.is_on_promotion
+		#     json.promotion_price  is.promotion_price
+		#     json.item_attributes  is.item_attributes
+		#   end
 
-		end
+		# end
 		#Child Menu items
-		if (item.menu_item_sets) then
-		  json.set_items item.menu_item_sets.each do |item|
-		    json.partial! 'api/restaurant/menu/menu_item', item: item
-		  end
+		# if (item.menu_item_sets) then
+		#   json.set_items item.menu_item_sets.each do |item|
+		#     json.partial! 'api/restaurant/menu/menu_item', item: item
+		#   end
 
-	    end
+	 	#end
+	 	# if category.menu_items
+	      # json.items category.menu_items do |item|
+	        json.partial! 'api/restaurant/menu/menu_item', item: item
+	      # end
+	    # end
     end
 end
diff --git a/app/views/origami/addorders/show.html.erb b/app/views/origami/addorders/show.html.erb
index f30d8b84..0e8a8163 100644
--- a/app/views/origami/addorders/show.html.erb
+++ b/app/views/origami/addorders/show.html.erb
@@ -49,9 +49,51 @@
             </div>
         </div>
     </div>
+    
+    <!-- Large modal -->
+<button class="btn btn-primary" data-toggle="modal" data-target=".sx_item_detailModal">Large modal</button>
+
+<div class="modal fade sx_item_detailModal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+  <div class="modal-dialog modal-lg">
+    <div class="modal-content">
+        <div class="modal-header" style="background-color: #54A5AF;">
+        <h4 class="modal-title" style="color:#fff;" id="title_name"></h4>
+           <button type="button" class="close" data-dismiss="modal" aria-hidden="true" style="font-size: 20px;color:#fff;">&times;</button>
+            
+        </div>
+        <div class="modal-body">
+            <div class="row">
+              <div class="col-md-5">
+                  <%= image_tag "logo.png" ,width: '', height: '', :style => '' %>
+                  <br><br>
+                  <div class="form-group">
+                    <h4 class="col-md-12">Quantity</h4>
+                    <input type="number" name="qty" class="form-control col-md-12 input-number" id="modal-qty" value="" min="1" max="100">
+                  </div>
+                  <div class="form-group row">
+                    <h4 class="col-md-6">Total</h4>
+                    <h4 class="col-md-6" id="total_price"> 2500 Ks</h4>
+                  </div>
+              </div>
+              <div class="col-md-7">
+                <h4>Options</h4>
+
+                <h4>Attributes</h4>
+
+              </div>
+            </div>
+        </div>
+        <div class="modal-footer">
+            
+            <button type="button" class="btn btn-primary" data-dismiss="modal" id="close">Close</button>
+            <button type="button" class="btn btn-success" data-dismiss="modal" id="save_order">Add Order</button>
+        </div>
+    </div>
+  </div>
+</div>
 
     <!-- Modal -->
-    <div class="modal fade" id="sx_itemModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal fade" id="sx_itemModal" tabindex="-1" role="dialog" aria-labelledby="sx_itemModalLabel" aria-hidden="true">
       <div class="modal-dialog" role="document">
         <div class="modal-content">
           <div class="modal-header">
@@ -59,29 +101,27 @@
             <h4 class="modal-title"></h4>
           </div>
           <div class="modal-body">
-
-                  <table width="100%" class="table table-striped">
-                   <thead>
-                     <tr>
-                       <th style="">Item Name</th>
-                       <th style="">Quantity</th>
-                       <th></th>
-                     </tr>
-                   </thead>
-                   <tbody>
-                     <tr>
-                       <td class="item_name" id="modal-item-name"></td>
-                       <td>
-                         <input type="number" name="qty" class="form-control col-md-12 input-number" id="modal-qty" value="" min="1" max="100">
-                       </td>
-                       <td>
-                         <button type="button" id="remove" class="btn btn-danger" data-dismiss="modal">Remove</button>
-                       </td>
-                     </tr>
-                   </tbody>
-                   </table>
-
-          </div>
+            <table width="100%" class="table table-striped">
+             <thead>
+               <tr>
+                 <th style="">Item Name</th>
+                 <th style="">Quantity</th>
+                 <th></th>
+               </tr>
+             </thead>
+             <tbody>
+               <tr>
+                 <td class="item_name" id="modal-item-name"></td>
+                 <td>
+                   <input type="number" name="qty" class="form-control col-md-12 input-number" id="modal-qty" value="" min="1" max="100">
+                 </td>
+                 <td>
+                   <button type="button" id="remove" class="btn btn-danger" data-dismiss="modal">Remove</button>
+                 </td>
+               </tr>
+             </tbody>
+             </table>
+         </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-primary" data-dismiss="modal" id="close">Close</button>
             <button type="button" class="btn btn-success" data-dismiss="modal" id="save">Update</button>
@@ -114,28 +154,21 @@ $(function(){
         data: {},
         dataType: "json",
         success: function(data) {
+          console.log(data);
             var menu_items_list = $('.menu_items_list');
             menu_items_list.empty();
             menu_items = data.menu_items;
             console.log(data);
             for(var field in menu_items) {  
-              if (menu_items[field].item_instances){
-                var price = parseFloat(menu_items[field].item_instances[1].price).toFixed(2);
-                var is_available = menu_items[field].item_instances[1].is_available 
-                var is_on_promotion = menu_items[field].item_instances[1].is_on_promotion
-                var item_attributes = menu_items[field].item_instances[1].item_attributes
-                var item_instance_code = menu_items[field].item_instances[1].item_instance_item_code
-                var item_instance_name = menu_items[field].item_instances[1].item_instance_name
-                var promotion_price = menu_items[field].item_instances[1].promotion_price
-              }else{
-                var price = parseFloat(menu_items[field].price).toFixed(2);
-                var is_available = menu_items[field].is_available 
-                var is_on_promotion = menu_items[field].is_on_promotion
-                var item_attributes = menu_items[field].item_attributes
-                var item_instance_code = menu_items[field].item_instance_item_code
-                var item_instance_name = menu_items[field].item_instance_name
-                var promotion_price = menu_items[field].promotion_price
-              }
+                
+                var code   = menu_items[field].instances[0].code
+                var name   = menu_items[field].instances[0].name
+                var price  = parseFloat(menu_items[field].instances[0].price).toFixed(2);
+                var is_available    = menu_items[field].instances[0].is_available 
+                var is_on_promotion = menu_items[field].instances[0].is_on_promotion
+                var item_attributes = menu_items[field].instances[0].item_attributes
+                var promotion_price = menu_items[field].instances[0].promotion_price
+
                 
                 row = '<div class="card">'
                         +'<div class="card-head" style="line-height:14px;">'
@@ -148,8 +181,8 @@ $(function(){
                              +'data-available="'+ is_available +'"'
                              +'data-promotion="'+ is_on_promotion +'"'
                              +'data-attributes="'+ item_attributes +'"'
-                             +'data-instance-code="'+ item_instance_code +'"'
-                             +'data-instance="'+ item_instance_name +'"'
+                             +'data-instance-code="'+ code +'"'
+                             +'data-instance="'+ name +'"'
                              +'data-promotion-price="'+ promotion_price +'"'
                             +'>'
                           +'<i class="fa fa-plus "'
@@ -157,12 +190,14 @@ $(function(){
                           +'</i></div>'
                         +'</div>'
 
-                        +'<div class="card-block">'
-                          +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>'
-                        +'</div>'
+                        +'<div class="menu_item_box" data-toggle="modal" data-target=".sx_item_detailModal">'
+                          +'<div class="card-block">'
+                            +'<%= image_tag "logo.png" ,width: '75', height: '75', :style => '' %>'
+                          +'</div>'
 
-                        +'<div class="card-footer">'
-                          +'<small>'+ price +'</small>'
+                          +'<div class="card-footer">'
+                            +'<small>'+ price +'</small>'
+                          +'</div>'
                         +'</div>'; 
                 $('.menu_items_list').append(row);
             }
@@ -230,6 +265,14 @@ $(function(){
       $('#modal-qty').val(qty);
     });
 
+    //click item row for update qty
+     $(document).on('click', '.menu_item_box', function(event){ 
+
+      data =  $(this).parent().children().children('.add_icon');
+      $('#title_name').text(data.attr('data-name'));
+      console.log(data);
+    });
+
     //click remove buttom in modal box
     $('#sx_itemModal').on('click','#remove', function(){
         $('.summary-items tr').filter(function(){
@@ -359,7 +402,7 @@ $(function(){
 .modal-dialog {
     left:auto;
     right: auto;
-    width: 600px;
+    width: 100%;
     padding-top: 100px;
 
 }