From 743b978c446e524ec29ee2d87b1d8a40b5d11bbf Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Sun, 4 Jun 2017 15:52:29 +0630
Subject: [PATCH 1/2] update

---
 app/views/settings/menu_item_instances/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb
index c0170245..7d326c95 100644
--- a/app/views/settings/menu_item_instances/_form.html.erb
+++ b/app/views/settings/menu_item_instances/_form.html.erb
@@ -1,5 +1,5 @@
 
-<%= simple_form_for([:settings,:menu_item, @settings_menu_item_instance]) do |f| %>
+<%= simple_form_for([:settings,@item, @settings_menu_item_instances]) do |f| %>
 
   <%= f.error_notification %>
 

From fcd159086818c784e0cf4aeea27f962fb5b5fce4 Mon Sep 17 00:00:00 2001
From: Nweni <nweni@eainyar.com>
Date: Mon, 19 Jun 2017 15:51:04 +0630
Subject: [PATCH 2/2] change query

---
 app/assets/stylesheets/origami.scss      | 4 ++++
 app/models/order.rb                      | 4 ++--
 app/views/origami/payments/show.html.erb | 7 ++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss
index 71a9915e..c96237fa 100644
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -95,6 +95,10 @@
 	background-color:#7a62d3;
 }
 
+.orange{
+	 background-color:#FF7F50;
+}
+
 .red {
 	background-color:#ff0000;
 }
diff --git a/app/models/order.rb b/app/models/order.rb
index f3ae798c..9c65304b 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -231,7 +231,7 @@ class Order < ApplicationRecord
                     .joins("left join orders on orders.order_id = booking_orders.order_id")
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
                     .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::TABLE_TYPE,true)
-                    .group("bookings.booking_id")
+                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id")
                     # For PG
                     # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true
                     # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id
@@ -262,7 +262,7 @@ class Order < ApplicationRecord
                     .joins("left join orders on orders.order_id = booking_orders.order_id")
                     .joins("left join sales on sales.sale_id = bookings.sale_id")
                     .where("(orders.status = 'new' or orders.status = 'billed') and (dining_facilities.type=? and dining_facilities.is_active=?)",DiningFacility::ROOM_TYPE,true)
-                    .group("bookings.booking_id")
+                    .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id")
                     # For PG
                     # booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true
                     # sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 995e13e9..91d5b6b2 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -235,9 +235,10 @@
   </div>
   <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- 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="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
+    <button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';">  <i class="fa fa-arrow-left fa-lg"></i> Back </button>
+    <button type="button" class="btn btn-primary btn-block"> FOC </button>
+    <button type="button" class="btn btn-primary btn-block"> Void </button>
+
   </div>
   </div>