From fa421ee718acf86fdbb1af2324e413e6fbf509cd Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 7 Sep 2018 17:44:57 +0630 Subject: [PATCH 1/2] remove git conflict --- app/assets/javascripts/order_reservation.js | 12 ++++++++++++ app/models/order_reservation.rb | 3 +++ app/pdf/receipt_bill_a5_pdf.rb | 14 +++++--------- app/pdf/receipt_bill_pdf.rb | 13 +++++-------- .../order_reservation/get_order.json.jbuilder | 2 +- app/views/origami/order_reservation/index.html.erb | 6 ++++++ .../20180406080240_create_order_reservations.rb | 4 +++- 7 files changed, 35 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index d1ed693e..bffd65fb 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -307,6 +307,18 @@ function show_order_detail(url,sr_no){ $('#expected_time').text(''); } + if((data.pickup_time!=undefined) && (data.pickup_time!=null)){ + var newPickupDate = new Date(data.pickup_time); + var pickup_time = timeFormat(newPickupDate); + var pickup_datetime = getOrderMonth(newPickupDate.getMonth()) +' '+ (newPickupDate.getDate() >= 10? newPickupDate.getDate() : '0' + newPickupDate.getDate()) +', '+newPickupDate.getFullYear()+'('+getOrderDay(newPickupDate.getDay())+')'+' '+pickup_time; + + $('.pickup-time').show(); + $('#pickup_time').text(pickup_datetime? pickup_datetime : ''); + }else{ + $('.pickup-time').hide(); + $('#pickup_time').text(''); + } + item_list.empty(); if(items!=undefined && items!=""){ diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index ae874c72..43d0145e 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -57,6 +57,9 @@ class OrderReservation < ApplicationRecord order_reservation.order_reservation_type = order_reserve[:order_type] order_reservation.customer_id = order_reserve[:cus_info] order_reservation.requested_time = Time.zone.parse(order_reserve[:requested_time]).utc + if order_reserve[:pickup_time] + order_reservation.pickup_time = Time.zone.parse(order_reserve[:pickup_time]).utc + end order_reservation.callback_url = order_reserve[:callback_url] order_reservation.transaction_ref = order_reserve[:reference] if order_reserve[:order_info] diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb index 945ca437..0314b1a9 100644 --- a/app/pdf/receipt_bill_a5_pdf.rb +++ b/app/pdf/receipt_bill_a5_pdf.rb @@ -113,6 +113,11 @@ class ReceiptBillA5Pdf < Prawn::Document end def cashier_info(sale_data, customer_name, latest_order_no) + move_down line_move + if !latest_order_no.nil? + move_down line_move + text "OrderNo : #{ latest_order_no }", :size => self.header_font_size,:align => :left + end move_down line_move # move_down 2 y_position = cursor @@ -159,15 +164,6 @@ class ReceiptBillA5Pdf < Prawn::Document # - #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') })" , # :size => self.item_font_size,:align => :right # end - - if !latest_order_no.nil? - y_position = cursor - move_down line_move - bounding_box([0,y_position], :width =>self.page_width - 10, :height => self.item_height) do - text "OrderNo : #{ latest_order_no }",:size => self.item_font_size,:align => :left - end - end - move_down line_move stroke_horizontal_rule end diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 5902469f..f060a95a 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -114,7 +114,11 @@ class ReceiptBillPdf < Prawn::Document def cashier_info(sale_data, customer_name, latest_order_no) move_down line_move - + if !latest_order_no.nil? + move_down line_move + text "OrderNo : #{ latest_order_no }", :size => self.header_font_size,:align => :left + end + move_down line_move # move_down 2 y_position = cursor bounding_box([0,y_position], :width =>self.description_width + self.price_num_width, :height => self.item_height) do @@ -153,13 +157,6 @@ class ReceiptBillPdf < Prawn::Document # - #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') })" , # :size => self.item_font_size,:align => :right # end - if !latest_order_no.nil? - y_position = cursor - move_down line_move - bounding_box([0,y_position], :width =>self.page_width - 10, :height => self.item_height) do - text "OrderNo : #{ latest_order_no }",:size => self.item_font_size,:align => :left - end - end move_down line_move stroke_horizontal_rule end diff --git a/app/views/origami/order_reservation/get_order.json.jbuilder b/app/views/origami/order_reservation/get_order.json.jbuilder index 6b0caba2..9ab022ed 100644 --- a/app/views/origami/order_reservation/get_order.json.jbuilder +++ b/app/views/origami/order_reservation/get_order.json.jbuilder @@ -1,7 +1,7 @@ if @order json.(@order, :order_reservation_id,:order_reservation_type,:customer_id, - :requested_time,:expected_waiting_time,:callback_url,:transaction_ref,:item_count,:total_customer,:payment_type, + :requested_time,:pickup_time,:expected_waiting_time,:callback_url,:transaction_ref,:item_count,:total_customer,:payment_type, :payment_status,:payment_ref,:taxes,:total_amount,:total_tax, :discount_amount,:convenience_charge,:grand_total,:status,:order_remark, :remark,:sale_id) diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 9b3fc7da..1d7f5615 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -429,6 +429,12 @@ MINS + + + PICK-UP TIME
+ + + NAME
diff --git a/db/migrate/20180406080240_create_order_reservations.rb b/db/migrate/20180406080240_create_order_reservations.rb index 96dd0b22..8285771f 100644 --- a/db/migrate/20180406080240_create_order_reservations.rb +++ b/db/migrate/20180406080240_create_order_reservations.rb @@ -4,7 +4,8 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1] t.string :order_reservation_id, :limit => 16, :primary_key => true t.string :order_reservation_type, :null => false t.string :customer_id, :null => false - t.datetime :requested_time, :null => false + t.datetime :requested_time, :null => false + t.datetime :pickup_time, :null => false t.string :callback_url, :null => false t.string :transaction_ref, :null => false t.string :sale_id @@ -23,6 +24,7 @@ class CreateOrderReservations < ActiveRecord::Migration[5.1] t.string :status, :null => false, :default => "new" t.string :order_remark t.string :remark + t.json :action_times t.timestamps end end From 61b54191f8f59476468f71d3a9a2eb084005114b Mon Sep 17 00:00:00 2001 From: yemin Date: Tue, 16 Oct 2018 09:40:02 +0630 Subject: [PATCH 2/2] Calculate shift sales function --- app/models/shift_sale.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index 18e20322..3ea6b5b0 100755 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -73,6 +73,7 @@ class ShiftSale < ApplicationRecord credit = saleobj.get_credit_amount other_sales = saleobj.get_other_amount tax = saleobj.get_commerical_tax + if type == "void" self.total_revenue = self.total_revenue.to_f - saleobj.total_amount.to_f self.total_discounts = self.total_discounts - saleobj.total_discount @@ -81,7 +82,7 @@ class ShiftSale < ApplicationRecord self.cash_sales = self.cash_sales.to_f - cash.to_f self.credit_sales = self.credit_sales.to_f - credit.to_f self.other_sales = self.other_sales.to_f - other_sales.to_f - self.nett_sales = self.nett_sales - (saleobj.total_amount.to_f - self.total_discounts) #self.grand_total.to_i - self.commercial_taxes + self.nett_sales = self.nett_sales - (saleobj.total_amount.to_f - saleobj.total_discount) #self.grand_total.to_i - self.commercial_taxes self.commercial_taxes = self.commercial_taxes.to_f - tax.to_f self.total_rounding = self.total_rounding - saleobj.rounding_adjustment self.total_void = self.total_void + saleobj.grand_total @@ -90,6 +91,8 @@ class ShiftSale < ApplicationRecord else self.takeaway_count = self.takeaway_count - 1 end + + self.save end end