diff --git a/app/assets/javascripts/channels/order_reservation.js b/app/assets/javascripts/channels/order_reservation.js index e3c06e47..84bf9285 100644 --- a/app/assets/javascripts/channels/order_reservation.js +++ b/app/assets/javascripts/channels/order_reservation.js @@ -18,7 +18,14 @@ App.checkin = App.cable.subscriptions.create('OrderReservationChannel', { var time = [date.getHours() - (isPM && !isMidday ? 12 : 0), date.getMinutes() || '00'].join(':') + (isPM ? ' PM' : 'AM'); - var requested_date = date.getDate() + '-' + date.getMonth() + '-' + date.getFullYear() + var month = 0; + if(parseInt(newDate.getMonth()) > 10){ + month = parseInt(newDate.getMonth()) + 1; + } + else{ + month = '0' + (parseInt(newDate.getMonth()) + 1); + } + var requested_date = date.getFullYear() +'-'+ month +'-'+ date.getDate(); row = '' +''+rowCount diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index 9b7c3fbb..2c7b71e3 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -63,6 +63,25 @@ $(function() { var delivery = data["delivery"]; var items = data["order_items"]; var item_list = $('.summary-items'); + + var date = new Date(data.requested_time); + var newDate = new Date(date.getTime() + (date.getTimezoneOffset() * 60000)); + + var isPM = newDate.getHours() >= 12; + var isMidday = newDate.getHours() == 12; + var time = [newDate.getHours() - (isPM && !isMidday ? 12 : 0), + newDate.getMinutes() || '00'].join(':') + + (isPM ? ' PM' : 'AM'); + var month = 0; + if(parseInt(newDate.getMonth()) > 10){ + month = parseInt(newDate.getMonth()) + 1; + } + else{ + month = '0' + (parseInt(newDate.getMonth()) + 1); + } + + var requested_date = newDate.getFullYear() + '-' + month +'-'+ newDate.getDate() +' '+time; + item_list.empty(); if(items!=undefined && items!=""){ @@ -84,9 +103,10 @@ $(function() { $('.summary-items').append(row); } + $('#requested_date_time').text(requested_date); $('#sub_total').text(data.total_amount); - $('#delivery_fee').text(delivery.delivery_fee); - $('#total_charges').text(0); + $('#delivery_fee').text(delivery.delivery_fee? delivery.delivery_fee : '0.0'); + $('#total_charges').text(data.convenience_charge?data.convenience_charge : '0.0'); $('#total_tax').text(data.total_tax); $('#grand_total').text(data.grand_total); @@ -100,9 +120,9 @@ $(function() { $('#callback_url').text(data.callback_url); $('#order_id').text(data.order_reservation_id); - if(delivery.provider == "direct_delivery"){ + if(delivery.delivery_type == "service"){ $("#delivery_info").text("(DELIVERY)"); - }else if(delivery.provider == "self_pick_up"){ + }else if(delivery.delivery_type == "self_pick_up"){ $("#delivery_info").text("(PICK-UP)"); } diff --git a/app/assets/stylesheets/order_reservation.scss b/app/assets/stylesheets/order_reservation.scss index c33e1f32..204195fd 100644 --- a/app/assets/stylesheets/order_reservation.scss +++ b/app/assets/stylesheets/order_reservation.scss @@ -85,4 +85,7 @@ } .tr-active{ background-color : #FFCDD2; +} +.div_order_margin { + margin: 0px 0px 0px -5px !important } \ No newline at end of file diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb index 85c9b858..b49ef597 100755 --- a/app/controllers/concerns/token_verification.rb +++ b/app/controllers/concerns/token_verification.rb @@ -24,8 +24,7 @@ module TokenVerification end end - @user = Employee. - (token) + @user = Employee.authenticate_by_token(token) if @user return true #Maybe log - login? diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb index 0d5d5277..f952c7f4 100644 --- a/app/controllers/origami/order_reservation_controller.rb +++ b/app/controllers/origami/order_reservation_controller.rb @@ -2,6 +2,7 @@ class Origami::OrderReservationController < BaseOrigamiController def index @order = OrderReservation.latest_order + @count_on_order = OrderReservation.get_count_on_order end def update diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index 296523cb..4337dcf6 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -29,9 +29,11 @@ class OrderReservation < ApplicationRecord order_reservation.payment_type = order_reserve[:payment_info][:payment_type] order_reservation.payment_status = order_reserve[:payment_info][:payment_status] order_reservation.payment_ref = order_reserve[:payment_info][:payment_ref] + order_reservation.taxes = order_reserve[:payment_info][:taxes] order_reservation.total_amount = order_reserve[:payment_info][:sub_total] order_reservation.total_tax = order_reserve[:payment_info][:total_tax] order_reservation.discount_amount = order_reserve[:payment_info][:discount_amount] + order_reservation.convenience_charge = order_reserve[:payment_info][:convenience_charge] order_reservation.grand_total = order_reserve[:payment_info][:grand_total] order_reservation.order_remark = order_reserve[:order_info][:order_remark] end @@ -272,6 +274,10 @@ class OrderReservation < ApplicationRecord order_reservation.save end + def self.get_count_on_order + order_reservation = OrderReservation.select("COUNT(order_reservation_id) as count, status").group("status") + end + private def generate_custom_id self.order_reservation_id = SeedGenerator.generate_id(self.class.name, "ODRS") diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 87533715..734276e4 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -2,19 +2,47 @@ <%= javascript_include_tag 'order_reservation', 'data-turbolinks-track': 'reload' %>
-
+
@@ -32,10 +60,10 @@ <%=i%> - <%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %> + <%= order.created_at.utc.getlocal.strftime("%d-%m-%Y") %> - <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %> + <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> <%=order.grand_total%> @@ -67,10 +95,10 @@ <%=i%> - <%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %> + <%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %> - <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %> + <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> <%=order.grand_total%> @@ -101,10 +129,10 @@ <%=i%> - <%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %> + <%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %> - <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %> + <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> <%=order.grand_total%> @@ -135,10 +163,10 @@ <%=i%> - <%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %> + <%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %> - <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %> + <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> <%=order.grand_total%> @@ -164,9 +192,9 @@
- @@ -199,7 +227,7 @@ @@ -227,9 +255,6 @@ - - - + + +
- - + + +
- DELIVERY FEES (PICK-UP) + DELIVERY FEES
+ REMARK
+ +
diff --git a/config/secrets.yml b/config/secrets.yml index b0d7c5c8..218234f1 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -13,7 +13,7 @@ development: secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 sx_provision_url: https://connect.pos-myanmar.com/bensai/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api - server_mode: cloud + server_mode: application cipher_type: AES-256-CBC sx_key: Wh@t1$C2L diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb index 740ce6f1..b96b92ca 100644 --- a/db/migrate/20180406080240_create_order_reservations.rb +++ b/db/migrate/20180406080240_create_order_reservations.rb @@ -13,9 +13,11 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1] t.string :payment_type t.string :payment_status t.string :payment_ref + t.json :taxes t.decimal :total_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :total_tax, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :discount_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :convenience_charge, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :grand_total, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.string :status, :null => false, :default => "new" t.string :order_remark