From 9df975db1c3df81f1a13018bf1367d2e2ea101b9 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 13 Jun 2018 11:18:32 +0630
Subject: [PATCH 1/2] Modified reprint color and click event

---
 .../pending_order/completed_sale.html.erb     | 30 +++++++++----------
 app/views/origami/sales/show.html.erb         | 20 +++++++++++--
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/app/views/origami/pending_order/completed_sale.html.erb b/app/views/origami/pending_order/completed_sale.html.erb
index 821414b3..1b7194f5 100644
--- a/app/views/origami/pending_order/completed_sale.html.erb
+++ b/app/views/origami/pending_order/completed_sale.html.erb
@@ -174,7 +174,7 @@
     <% if @sale.sale_status != 'void' && @sale.sale_status != 'waste' && @sale.sale_status != 'spoile' %>
       <% if current_user.role == "cashier" %>
         <a class="btn btn-block bg-red waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
-        <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="reprints"> Re.Print</a>
+        <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="reprint"> Re.Print</a>
        
       <% else %>
         <button type="button" class="btn bg-red btn-block" data-toggle="modal" data-target="#voidModal" <%= (can? :overall_void, :void)? ' ': 'disabled=' %> > Void </button>
@@ -257,21 +257,21 @@ $(document).ready(function(){
       var sale_id = $(this).attr("data-id");
       window.location.href = '/origami/quick_service/completed_sale/' + sale_id;
   })
-  // $('#reprint').on('click', function () {
-  //   var sale_id = $('#sale_id').val();
-  //   var ajax_url = '/origami/'+ sale_id  + "/reprint"
+  $('#reprint').on('click', function () {
+    var sale_id = $('#sale_id').val();
+    var ajax_url = '/origami/'+ sale_id  + "/reprint"
 
-  //   $.ajax({
-  //     type: "GET",
-  //     url: ajax_url,
-  //     success: function (result) {
-  //       if ($("#server_mode").val() == "cloud") {
-  //         code2lab.printFile(result.filepath.substr(6), result.printer_url);
-  //         }
-  //       location.reload();
-  //     }
-  //   });
-  // });
+    $.ajax({
+      type: "GET",
+      url: ajax_url,
+      success: function (result) {
+        if ($("#server_mode").val() == "cloud") {
+          code2lab.printFile(result.filepath.substr(6), result.printer_url);
+          }
+        location.reload();
+      }
+    });
+  });
   $('#back').on('click', function () {
     window.location.href = '/origami/quick_service/pending_order';
   });
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb
index 86b013af..9ca1cd72 100755
--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -258,10 +258,10 @@
   <% if @sale.sale_status != 'void' && @sale.sale_status != 'waste' && @sale.sale_status != 'spoile' %>
      <% if current_login_employee.role == "cashier" %>
         <a class="btn btn-block bg-danger waves-effect access_modal" data-toggle="modal"  data-type="void"> Void</a>
-        <a class="btn btn-block bg-red waves-effect access_modal" data-toggle="modal"  data-type="reprint"> Re.Print</a>
+        <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal"  data-type="reprint"> Re.Print</a>
      <% else %>      
            <button type="button" id="void" class="btn bg-danger btn-block">VOID</button>   
-           <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button>   
+           <button type="button" id="reprint" class="btn bg-blue btn-block">Re.Print</button>   
      <% end %>
    <% end %> 
    
@@ -369,6 +369,22 @@ $(document).ready(function(){
   })
 });
 
+$('#reprint').on('click', function () {
+    var sale_id = $('#sale_id').val();
+    var ajax_url = '/origami/'+ sale_id  + "/reprint"
+
+    $.ajax({
+      type: "GET",
+      url: ajax_url,
+      success: function (result) {
+        if ($("#server_mode").val() == "cloud") {
+          code2lab.printFile(result.filepath.substr(6), result.printer_url);
+          }
+        location.reload();
+      }
+    });
+  });
+
 $('#pay').on('click',function() {
    var sale_id = $('#sale_id').val();
    window.location.href = '/origami/sale/'+ sale_id + "/payment";

From 223a84ec67ab9016c643fdf2b0f29278d91ccf0f Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Wed, 13 Jun 2018 11:19:52 +0630
Subject: [PATCH 2/2] =?UTF-8?q?Pull=20from=20master=E1=80=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/javascripts/addorder.js          | 8 ++++----
 app/views/origami/addorders/detail.html.erb | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index a9bd453a..07af7f41 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -6,8 +6,8 @@ $(function() {
   
   //click menu sidebar menu category
   $(".product").on("click", function(){
-    // /var url = $(this).attr('data-ref');
-    // /show_product_list(url); 
+    var url = $(this).attr('data-ref');
+    show_product_list(url); 
   }); 
   //show menu item list when click menu category
   function show_product_list(url_item){ 
@@ -43,7 +43,7 @@ $(function() {
             options         = [];
             item_attributes = [];
 
-            if (product[field].image_path) {
+            if (product[field].image_path.url) {
               if (type != -1 && modify_order != -1) {
                 image_path = '../../'+product[field].image_path.url;
               }
@@ -74,7 +74,7 @@ $(function() {
                       +'</div>'
                      +'</div>'
 
-                  +"<div class='add_icon'  data-item-code='"
+                  +"<div class='add_icon p-t-65'  data-item-code='"
                         + product[field].item_code +"' data-name='"
                         + product[field].name +"' data-qty = '"+ qty +"' data-price = '"
                         + product[field].unit_price +"' data-instance-code = '"+ product[field].item_code +"' data-instance = '"
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 07b555c9..c20b53e1 100644
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -668,6 +668,12 @@
         menu_cat.empty();
 
         $(".main_menu").text(name);
+
+        //  row = ' <li class="nav-item product" data-ref="<%= origami_get_all_product_path %>">'
+        //     +'<a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>'
+        //    +'</li>';
+        // $(".category_cache_list").append(row);
+
         for(var i in menus) {  
 
           if (menu_id == menus[i]["id"] && menus[i]["is_active"] == true) {