From 5636b7a61ac45514515255933e8c3701a1a83db8 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Thu, 15 Jun 2017 11:51:49 +0630
Subject: [PATCH 1/3] Update

---
 db/seeds.rb                | 10 +++++-----
 lib/tasks/menu_import.rake | 39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/db/seeds.rb b/db/seeds.rb
index 458a0873..ea80fe99 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -81,12 +81,12 @@ customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_
 customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111"})
 
 #Default ZOne
-zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"})
-zone2 = Zone.create({id:2, name: "VIP Zone", is_active:true, created_by: "SYSTEM DEFAULT"})
+# zone = Zone.create({id:1, name: "Normal Zone", is_active:true, created_by: "SYSTEM DEFAULT"})
+# zone2 = Zone.create({id:2, name: "VIP Zone", is_active:true, created_by: "SYSTEM DEFAULT"})
 
 #Default dining_facilities
-table = Table.create({name:"Table 1", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
-room = Room.create({name:"Table 2", zone: zone2, status:"available", seater: 4 , order_by:1, created_by:"SYSTEM DEFAULT"})
+# table = Table.create({name:"Table 1", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+# room = Room.create({name:"Table 2", zone: zone2, status:"available", seater: 4 , order_by:1, created_by:"SYSTEM DEFAULT"})
 
 #Tax Profile
 tax_profiles = TaxProfile.create({id:1, name: "Commerical Tax", rate:5.0, order_by:1, created_by:"SYSTEM DEFAULT"})
@@ -132,7 +132,7 @@ zone_order_queue_station = OrderQueueStation.create({station_name: "Zone 1 Queue
 
 
 #Default Order Queue Process By Zone
-zone_queue_station = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone2})
+#zone_queue_station = OrderQueueProcessByZone.create({order_queue_station: zone_order_queue_station, zone: zone2})
 
 
 #Create Adminstrator employee
diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake
index c1a90c53..ce051313 100644
--- a/lib/tasks/menu_import.rake
+++ b/lib/tasks/menu_import.rake
@@ -576,5 +576,44 @@ menu_category19 = MenuCategory.create({menu: menu, code:"C0018", name: "Beer", a
 menu_category20 = MenuCategory.create({menu: menu, code:"C0019", name: "Signature Hot Tea", alt_name: "Chicken", order_by: 19, created_by: "SYSTEM DEFAULT"})
 puts "Beauty in the pot's menu setup"
 
+zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"})
+  table = Table.create({name:"61", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"62", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"53", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"54", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"24", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"25", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"26", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"34", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"35", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"45", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"46", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"47", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"48", zone: zone, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+
+zone2 = Zone.create({id:2, name: "H2", is_active:true, created_by: "SYSTEM DEFAULT"})
+  table = Table.create({name:"51", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"52", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"11", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"12", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"21", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"22", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"23", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"31", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"32", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"33", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"41", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"42", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"43", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"44", zone: zone2, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+zone3 = Zone.create({id:3, name: "H3", is_active:true, created_by: "SYSTEM DEFAULT"})
+  table = Table.create({name:"71", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"72", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"73", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"74", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"75", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"76", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"77", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
+  table = Table.create({name:"78", zone: zone3, status:"available", seater: 2 , order_by:1, created_by:"SYSTEM DEFAULT"})
 end
 end

From 5675f0e48bcd1faf97e09e4f34ae8b287ba19ecf Mon Sep 17 00:00:00 2001
From: Phyo <phyo.theingi@code2lab.com>
Date: Thu, 15 Jun 2017 12:29:36 +0630
Subject: [PATCH 2/3] Payment Bug fix

---
 app/views/origami/payments/show.html.erb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index dab6615d..add50dac 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -237,12 +237,16 @@
     <!-- Waiter Buttons -->
     <button type="button" class="btn btn-primary btn-lg btn-block"> Foc </button>
     <button type="button" class="btn btn-primary btn-lg btn-block"> Void </button>
-    <button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami';"> Back </button>
+    <button type="button" class="btn btn-primary btn-lg btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
   </div>
   </div>
 
 <script>
 $(document).ready(function(){
+  if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+  else {
+    $('#cash').text(localStorage.getItem("cash"));
+  }
   update_balance();
 })
 
@@ -301,6 +305,7 @@ $( document ).ready(function() {
  });
 
  $('#card_payment').click(function() {
+   localStorage.setItem("cash",$('#cash').text() );
    var sale_id = $('#sale_id').text();
     window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
     return false;
@@ -315,10 +320,12 @@ $( document ).ready(function() {
       var credit = $('#credit').text();
       var card = $('#card').text();
       var sale_id = $('#sale_id').text();
+
       $.ajax({type: "POST",
         url: "<%= origami_payment_cash_path %>",
         data: "cash="+ cash + "&sale_id=" + sale_id,
         success:function(result){
+          localStorage.removeItem("cash");
           if($('#balance').text() < 0){
             alert("Changed amount  " + $('#balance').text() * (-1) )
           }else{

From 3eb1848fbaaa1cf1add7488e8bdf3b9fa76f5b37 Mon Sep 17 00:00:00 2001
From: Phyo <phyo.theingi@code2lab.com>
Date: Thu, 15 Jun 2017 12:30:13 +0630
Subject: [PATCH 3/3] Puma for production

---
 config/puma.rb.production | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 config/puma.rb.production

diff --git a/config/puma.rb.production b/config/puma.rb.production
new file mode 100644
index 00000000..04ae9ee4
--- /dev/null
+++ b/config/puma.rb.production
@@ -0,0 +1,9 @@
+application_path = '/home/superuser/Application/production/sxrestaurant'
+directory application_path
+environment 'production'
+daemonize true
+pidfile "#{application_path}/tmp/pids/puma.pid"
+state_path "#{application_path}/tmp/pids/puma.state"
+stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+bind 'tcp://0.0.0.0:9292'
+workers 2