Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

README.md

@@ -7,6 +7,32 @@ Things you may want to cover:
 * Ruby version
 ruby 2.4.1p111
 
+* Membership Details
+
+	Osaka
+
+		Auth Token        => rj0MJ0XI5GsKZehE => New
+
+						  => code2lab => Old
+
+		Merchant account  => RxzaYyAGzm7VqAZ4hKnv
+
+	    Campaign Id       => {"campaign_type_id": 5}
+
+
+
+    BITP
+
+		Auth Token        => rj0MJ0XI5GsKZehE => New
+
+						  => code2lab => Old
+
+		Merchant account  => vWSsseoZCzxd6xcNf_uS
+		
+	    Campaign Id       => {"campaign_type_id": 1}
+
+
+
 * ToDo list
 
 1. Cloud Sync
@@ -104,3 +130,4 @@ ruby 2.4.1p111
 	3. Delete							=> btn-delete
 	4. Cancel/Back						=> btn-default
 
+

app/assets/javascripts/addorder.js

@@ -373,7 +373,7 @@ $(function() {
     $('.add_to_order').removeAttr('data-attributes');
     $('.add_to_order').removeAttr('data-options');
 
-     $('.keypress_qty').val(1);
+     $('.change_qty').val(1);
 
     change_qty_plus_minus("count","plus","minus");
 

app/models/sale_payment.rb

@@ -20,7 +20,7 @@ class SalePayment < ApplicationRecord
       end
     end
 
-    if (amount_due > 0)
+    if (amount_due >= 0)
       payment_status = false
       #route to payment type
       case payment_method

app/views/origami/shifts/new.html.erb

@@ -29,7 +29,7 @@
 
     </div>
     <div class='col-md-8'>
-      <div class="row">
+      <div class="row p-l-30">
        <div class="col-lg-6 col-md-6 col-sm-6">
          <div class="row bottom">
            <div class=" cashier_number " data-value="1" data-type="num">1</div>