diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index 71e6b25a..2513ab30 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -7,6 +7,7 @@ $(function() { $('#cancel').hide(); $(".tbl_customer").hide(); $(".order_close_cashier").hide(); + $(".order_payment_type").hide(); $(function() { $('.first-1').click(); }); @@ -253,6 +254,8 @@ function refreshDetailData(){ $('#grand_total').text("0.00"); $(".tbl_customer").hide(); $(".order_close_cashier").hide(); + $(".order_payment_type").hide(); + $("#payment_type").text(""); } //show order list @@ -355,6 +358,8 @@ function show_order_detail(url,sr_no){ $('#phone').text(data.phone); $('#address').text(address); + $(".order_payment_type").show(); + $("#payment_type").text(data.payment_type); $('#ref_no').text(data.transaction_ref); $('#callback_url').text(data.callback_url); $('#order_id').text(data.order_reservation_id); diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index a8f1f4ec..ecad6da5 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -173,7 +173,6 @@ class OrderReservation < ApplicationRecord end def self.send_status_to_ordering(url,ref_no,status,waiting_time=nil,min_type=nil,reason=nil) - puts "send status to ordering" base_url = 'https://api.doemal.com' token = '3T-tnlYtFJ-5Z1vY6XQqxQ' order_reservation = Lookup.collection_of("order_reservation") @@ -400,7 +399,7 @@ class OrderReservation < ApplicationRecord if filter.blank? keyword = '' else - keyword = "status LIKE '%#{filter}%'" + keyword = "status LIKE '%#{filter}%' OR payment_type LIKE '%#{filter}%'" end if from.present? && to.present? @@ -411,7 +410,7 @@ class OrderReservation < ApplicationRecord else select("order_reservations.*, deliveries.provider, deliveries.delivery_fee") .joins(" JOIN deliveries on deliveries.order_reservation_id = order_reservations.order_reservation_id") - .where("status LIKE '%#{filter}%'") + .where("status LIKE '%#{filter}%' OR payment_type LIKE '%#{filter}%'") end end diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 2192fbfd..b0cd2e9e 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -398,10 +398,14 @@
| + |
REF. |
+
+ PAYMENT + + |
|||||||
|
diff --git a/app/views/transactions/order_reservations/index.html.erb b/app/views/transactions/order_reservations/index.html.erb
index 180ab03a..0bd1c014 100644
--- a/app/views/transactions/order_reservations/index.html.erb
+++ b/app/views/transactions/order_reservations/index.html.erb
@@ -19,7 +19,7 @@
-
+
diff --git a/app/views/transactions/order_reservations/show.html.erb b/app/views/transactions/order_reservations/show.html.erb
index aa2c7e58..ed6d2da8 100755
--- a/app/views/transactions/order_reservations/show.html.erb
+++ b/app/views/transactions/order_reservations/show.html.erb
@@ -48,6 +48,7 @@
<%= t("views.right_panel.detail.requested_time") %> |
<%= t("views.right_panel.detail.cooking_time") %> |
<%= t("views.right_panel.detail.status") %> |
+ <%= t :payment %> <%= t("views.right_panel.detail.type") %> |
<%= t("views.right_panel.detail.remark") %> |
| <%= @order_reservation.requested_time.utc.getlocal.strftime("%Y-%m-%d %I:%M %p") %> | <%= @order_reservation.expected_waiting_time rescue '-' %> | <%= @order_reservation.status %> | +<%= @order_reservation.payment_type %> | <%= @order_reservation.order_remark ? @order_reservation.order_remark : @order_reservation.reservation_remark %> |
| <%= t("views.right_panel.detail.total_price") %> | <%= t("views.right_panel.detail.created_at") %> | + | |||||||
|---|---|---|---|---|---|---|---|---|---|
| <%= number_with_precision(item.price > 0 ? item.qty * item.price : item.qty * item.unit_price, precision:precision.to_i, delimiter:delimiter) rescue ' '%> | <%=l item.created_at.utc.getlocal , :format => :short rescue ' ' %> | + | |||||||
| <%= t("views.right_panel.detail.sub_total") %> | -<%= number_with_precision(total_amount, precision:precision.to_i, delimiter:delimiter) rescue ' '%> | +<%= number_with_precision(total_amount, precision:precision.to_i, delimiter:delimiter) rescue ' '%> | |||||||
| <%= t("views.right_panel.detail.discount_amount") %> | -<%= number_with_precision(total_discount_amount, precision:precision.to_i, delimiter:delimiter) rescue ' '%> | +<%= number_with_precision(total_discount_amount, precision:precision.to_i, delimiter:delimiter) rescue ' '%> | |||||||
| <%= t("views.right_panel.detail.delivery_fee") %> | -<%= number_with_precision(total_delivery_fee, precision:precision.to_i, delimiter:delimiter) rescue ' '%> | +<%= number_with_precision(total_delivery_fee, precision:precision.to_i, delimiter:delimiter) rescue ' '%> | |||||||
| <%= t("views.right_panel.detail.convenience_charge") %> | -<%= number_with_precision(total_convenience_charge, precision:precision.to_i, delimiter:delimiter) rescue ' '%> | +<%= number_with_precision(total_convenience_charge, precision:precision.to_i, delimiter:delimiter) rescue ' '%> | |||||||