From 234ef9bc1530722cf20393409b0d2bb39b8f4330 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 7 Jun 2017 22:17:12 +0630
Subject: [PATCH] change crm booking

---
 Gemfile                                             | 2 +-
 Gemfile.lock                                        | 2 --
 app/controllers/origami/request_bills_controller.rb | 2 +-
 app/models/order.rb                                 | 2 --
 app/views/api/bookings/show.json.jbuilder           | 6 +++---
 app/views/crm/home/_booking.html.erb                | 2 +-
 config/routes.rb                                    | 3 +++
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9030eff4..f413ead6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ end
 gem 'rails', '~> 5.1.0'
 # Use mysql as the database for Active Record
 
-gem 'mysql2', '>= 0.3.18', '< 0.5'
+#gem 'mysql2', '>= 0.3.18', '< 0.5'
 
 #Use PosgreSQL
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 533cd08b..2c4c94b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -119,7 +119,6 @@ GEM
     minitest (5.10.2)
     multi_json (1.12.1)
     multi_xml (0.6.0)
-    mysql2 (0.4.6)
     nio4r (2.1.0)
     nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
@@ -259,7 +258,6 @@ DEPENDENCIES
   jquery-rails
   kaminari!
   listen (~> 3.0.5)
-  mysql2 (>= 0.3.18, < 0.5)
   pg
   prawn
   prawn-table
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 9e14e9ea..9ccce028 100644
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -1,6 +1,6 @@
 class Origami::RequestBillsController < BaseOrigamiController
 
-  def create
+  def show
     @sale = Sale.new
 
 
diff --git a/app/models/order.rb b/app/models/order.rb
index 0473e92c..a8a6a3ef 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -218,7 +218,6 @@ class Order < ApplicationRecord
         left join dining_facilities on dining_facilities.id = bookings.dining_facility_id
         left join order_items on order_items.order_id = orders.order_id")
         .where("dining_facilities.type=? and orders.order_type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,"dine_in",true)
-
         .group("orders.order_id, order_items.order_items_id,dining_facilities.name")
   end
   def self.get_booking_order_table
@@ -271,7 +270,6 @@ class Order < ApplicationRecord
           left join sale_orders on sale_orders.order_id = orders.order_id
           left join sales on sales.sale_id = sale_orders.sale_id")
           .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
-
           .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id")
 
   end
diff --git a/app/views/api/bookings/show.json.jbuilder b/app/views/api/bookings/show.json.jbuilder
index 27ec21b9..2e8708d3 100644
--- a/app/views/api/bookings/show.json.jbuilder
+++ b/app/views/api/bookings/show.json.jbuilder
@@ -1,7 +1,7 @@
 if (@booking)
   json.id @booking.booking_id
   json.status @booking.booking_status
-  json.checkin_at @booking.checkin_at
+  json.checkin_at @booking.checkin_at.strftime("%d-%m-%Y")
   json.checkin_by @booking.checkin_by
   json.table_name @booking.dining_facility.name
 
@@ -17,9 +17,9 @@ if (@booking)
     order_items = []
     @booking.booking_orders.each do |bo|
       order = Order.find(bo.order_id)
-      if (order.status == "new")
+      #if (order.status == "new")
         order_items = order_items + order.order_items
-      end
+      #end
     end
 
     json.order_items order_items do |item|
diff --git a/app/views/crm/home/_booking.html.erb b/app/views/crm/home/_booking.html.erb
index f69f5fe0..d4f2a756 100644
--- a/app/views/crm/home/_booking.html.erb
+++ b/app/views/crm/home/_booking.html.erb
@@ -40,7 +40,7 @@ $(function(){
       $(".summary-items tbody tr").remove();
       $("#cancel").removeAttr("disabled");
       $("#assign").removeAttr("disabled");
-      var url = $(this).attr('data-ref');alert(url);
+      var url = $(this).attr('data-ref');
       show_details(url); 
     }); 
 
diff --git a/config/routes.rb b/config/routes.rb
index 558e2c2d..d69e753b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -72,6 +72,9 @@ Rails.application.routes.draw do
       resources :customers, only: [:index,:new, :create ] #add customer type
     end
 
+    resources :request_bills, only: [:show]
+    get 'sale/:sale_id/payment' => 'request_bills#show'
+
     get 'sale/:sale_id/payment' => 'payments#show'
     post 'payment_process' => 'payments#create'