From 758b36000e3bdf97071a3875db4f5544fbf6d58e Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 7 Nov 2017 14:48:33 +0630
Subject: [PATCH] origami numpad ui fix and promotion fix

---
 app/assets/stylesheets/origami.scss      | 16 +++++++++--
 app/models/promotion.rb                  |  2 +-
 app/views/origami/payments/show.html.erb | 36 ++++++++++++++++--------
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 39152c58..de838a1e 100755
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -158,7 +158,7 @@ select.form-control {
 }
 
 .long{
-	width:43%;
+	width:49%;
 }
 
 .sold {
@@ -240,7 +240,7 @@ select.form-control {
 /* End Colors */
 
 .left{
-	margin-left:20px;
+	margin-left:1px;
 }
 
 .bottom{
@@ -326,3 +326,15 @@ tr.discount-item-row:hover {
     -moz-opacity: 1; /* mozilla */
         
 }
+
+/* For Payment Page */
+
+.payment-long {
+	width:43%;
+}
+
+.payment-left {
+	margin-left: 20px;
+}
+
+/* End Payment Page */
diff --git a/app/models/promotion.rb b/app/models/promotion.rb
index bc1516cc..2edc9421 100755
--- a/app/models/promotion.rb
+++ b/app/models/promotion.rb
@@ -218,7 +218,7 @@ class Promotion < ApplicationRecord
     else
       foc_qty = find_second_item_qty(sale_id, promo_product.item_code)
       # give total qty is 1
-      foc_qty = (foc_qty - foc_qty) + 1
+      #foc_qty = (foc_qty - foc_qty) + 1
 
       item = OrderItem.find_by_item_instance_code(promo_product.item_code)
       # total = item.price * foc_qty
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index cfaa96bd..ec129d07 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -248,15 +248,15 @@
        </div>
        <div class="col-lg-6 col-md-6 col-sm-6">
          <div class="row bottom">
-           <div class="cashier_number border-top border-right border-left long left" data-value="1000" data-type="add">1000</div>
-           <div class="cashier_number border-top border-right border-left long" data-value="3000" data-type="add">3000</div>
+           <div class="cashier_number border-top border-right border-left payment-long payment-left" data-value="1000" data-type="add">1000</div>
+           <div class="cashier_number border-top border-right border-left payment-long" data-value="3000" data-type="add">3000</div>
          </div>
          <div class="row bottom">
-           <div class="cashier_number border-top border-right border-left long left" data-value="5000" data-type="add">5000</div>
-           <div class="cashier_number border-top border-right border-left long" data-value="10000" data-type="add">10000</div>
+           <div class="cashier_number border-top border-right border-left payment-long payment-left" data-value="5000" data-type="add">5000</div>
+           <div class="cashier_number border-top border-right border-left payment-long" data-value="10000" data-type="add">10000</div>
          </div>
           <div class="row bottom">
-           <div class="pay border-top border-right border-left purple left" id="pay">Pay</div>
+           <div class="pay border-top border-right border-left purple payment-left" id="pay">Pay</div>
           </div>
        </div>
      </div>
@@ -264,7 +264,10 @@
  </div>
 </div>
 <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
-  <button type="button" class="btn bg-default btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami/table/'+<%= @sale_data.bookings[0].dining_facility_id %>;"> <i class="material-icons">reply</i> Back </button>
+  <button type="button" class="btn btn-block btn-default waves-effect" id='back'>
+    <i class="material-icons">reply</i>
+     Back
+  </button>
   <button type="button" class="btn bg-deep-purple btn-block" id="foc"> FOC </button>
   <button type="button" class="btn bg-red btn-block" id="void"> Void </button>
   <!-- Waiter Buttons -->
@@ -275,12 +278,21 @@
 
 <script>
   $(document).ready(function(){
-    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
-      else {
-        $('#cash').text(localStorage.getItem("cash"));
-      }
-      update_balance();
-    })
+    var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>";
+
+    $("#back").on('click', function() {
+      localStorage.removeItem('cash');
+      window.location.href = '/origami/table/'+ dining_id;
+    });
+
+    if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){
+
+    }
+    else {
+      $('#cash').text(localStorage.getItem("cash"));
+    }
+    update_balance();
+  });
 
   $(document).on('click', '.cashier_number', function(event){
     if(event.handled !== true) {