From 7f04c284c6e1028dbb9c33f818ce48e729d03382 Mon Sep 17 00:00:00 2001 From: phyusin Date: Tue, 5 Jun 2018 13:28:36 +0630 Subject: [PATCH 1/4] customer update from doemal order --- .../order_reserve/order_reservation_controller.rb | 15 ++++++++++----- app/models/order_reservation.rb | 6 +++++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb index 6d323f52..557b3d7a 100644 --- a/app/controllers/api/order_reserve/order_reservation_controller.rb +++ b/app/controllers/api/order_reserve/order_reservation_controller.rb @@ -14,12 +14,17 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController end if status - check_customer = Customer.find_by_email_and_membership_id_and_customer_type(params[:email],params[:membership_id],'Doemal') - if !check_customer.nil? - customer_id = check_customer.customer_id + if params[:customer_id] && !params[:customer_id].nil? + customer = OrderReservation.addCustomer(params) + customer_id = customer.id else - customer = OrderReservation.addCustomer(params) - customer_id = customer.id + check_customer = Customer.find_by_email_and_membership_id_and_customer_type(params[:email],params[:membership_id],'Doemal') + if !check_customer.nil? + customer_id = check_customer.customer_id + else + customer = OrderReservation.addCustomer(params) + customer_id = customer.id + end end if !customer_id.nil? render :json => { :status => false, :message => "email and customer are already existed!" } diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index 4e9235dc..dc3026aa 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -22,7 +22,11 @@ class OrderReservation < ApplicationRecord else gender = "Male" end - customer = Customer.new + if params[:customer_id].nil? + customer = Customer.find(params[:customer_id]) + else + customer = Customer.new + end customer.name = params[:name] customer.email = params[:email] customer.contact_no = params[:contact_no] ? params[:contact_no] : '' From dd58daa05672bbb789033c44e96eced97fa44c40 Mon Sep 17 00:00:00 2001 From: phyusin Date: Tue, 5 Jun 2018 15:38:42 +0630 Subject: [PATCH 2/4] check customer --- app/assets/javascripts/custom.js | 12 ------------ app/assets/javascripts/order_reservation.js | 12 ++++++++++++ app/assets/javascripts/origami.js | 1 - .../order_reserve/order_reservation_controller.rb | 7 ++++--- app/models/order_reservation.rb | 3 +-- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index e14cc205..f81daaa3 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -157,15 +157,3 @@ $(document).ready(function() { } //end Notificaiotn message }); - -/* start order reservation function */ -function audioPlayBackground(shop_code,audio){ - // console.log(shop_code); - //audio play - var audio = new Audio('/'+audio); // define your audio - // setTimeout(function(){ - // audio.loop = true; - audio.play(); - // },10000); -} -/* end order reservation function */ diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index f187a2db..4c2958ec 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -579,4 +579,16 @@ function timeFormat(date){ (isPM ? ' PM' : ' AM'); return time; } +/* end order reservation function */ + +/* start order reservation function */ +function audioPlayBackground(shop_code,audio){ + // console.log(shop_code); + //audio play + var audio = new Audio('/'+audio); // define your audio + // setTimeout(function(){ + // audio.loop = true; + audio.play(); + // },10000); +} /* end order reservation function */ \ No newline at end of file diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 67911d9e..32c7f81e 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -15,7 +15,6 @@ //= require BSBMaterial/turbolink_admin.js //= require BSBMaterial/demo.js //= require custom.js -//= require order_reservation.js /* Constant Varaibles */ _CREDIT_PAYMENTS_ = "/   CREDIT PAYMENTS"; diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb index 557b3d7a..9fb392fe 100644 --- a/app/controllers/api/order_reserve/order_reservation_controller.rb +++ b/app/controllers/api/order_reserve/order_reservation_controller.rb @@ -16,17 +16,18 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController if status if params[:customer_id] && !params[:customer_id].nil? customer = OrderReservation.addCustomer(params) - customer_id = customer.id + customer_id = customer.customer_id else check_customer = Customer.find_by_email_and_membership_id_and_customer_type(params[:email],params[:membership_id],'Doemal') if !check_customer.nil? customer_id = check_customer.customer_id else customer = OrderReservation.addCustomer(params) - customer_id = customer.id + customer_id = customer.customer_id end end - if !customer_id.nil? + + if customer_id.nil? render :json => { :status => false, :message => "email and customer are already existed!" } else render :json => { :status => true, :data => { :customer_id => customer_id} } diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index dc3026aa..e901021a 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -22,7 +22,7 @@ class OrderReservation < ApplicationRecord else gender = "Male" end - if params[:customer_id].nil? + if params[:customer_id] && !params[:customer_id].nil? customer = Customer.find(params[:customer_id]) else customer = Customer.new @@ -37,7 +37,6 @@ class OrderReservation < ApplicationRecord customer.customer_type = "Doemal" customer.tax_profiles = ["2"] customer.save - # unless customer.valid? # render json: { # status: 422, From 7f249feda25a26e527e924698ed5cabf54efb3d9 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 5 Jun 2018 15:50:06 +0630 Subject: [PATCH 3/4] update origami dashboard --- app/controllers/home_controller.rb | 2 +- .../origami/dashboard_controller.rb | 37 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index e23da859..325cb241 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -67,7 +67,7 @@ class HomeController < ApplicationController redirect_to origami_root_path elsif @employee.role == "waiter" session[:session_token] = @employee.token_session - redirect_to origami_dashboard_path + route_by_role(@employee) elsif @employee.role == "account" session[:session_token] = @employee.token_session redirect_to reports_dailysale_index_path diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb index a633c9e1..ab7bde82 100644 --- a/app/controllers/origami/dashboard_controller.rb +++ b/app/controllers/origami/dashboard_controller.rb @@ -25,15 +25,18 @@ class Origami::DashboardController < BaseOrigamiController @sale_data = Array.new @total_payment_methods = Sale.total_payment_methods(today,current_user) - - @total_payment_methods.each do |payment| - if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb" - pay = Sale.payment_sale('card', today, current_user) - @sale_data.push({'card' => pay.payment_amount}) - else - pay = Sale.payment_sale(payment.payment_method, today, current_user) - @sale_data.push({payment.payment_method => pay.payment_amount}) - end + if !@total_payment_methods.nil? + @total_payment_methods.each do |payment| + if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb" + pay = Sale.payment_sale('card', today, current_user) + @sale_data.push({'card' => pay.payment_amount}) + else + pay = Sale.payment_sale(payment.payment_method, today, current_user) + @sale_data.push({payment.payment_method => pay.payment_amount}) + end + end + else + @sale_data = nil end @summ_sale = Sale.summary_sale_receipt(today,current_user) @total_customer = Sale.total_customer(today,current_user) @@ -45,12 +48,16 @@ class Origami::DashboardController < BaseOrigamiController @total_order = Sale.total_order(today,current_user) @total_accounts = Sale.total_account(today,current_user) @account_data = Array.new - @total_accounts.each do |account| - acc = Sale.account_data(account.account_id, today,current_user) - if !acc.nil? - @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc}) - end - end + if !@total_accounts.nil? + @total_accounts.each do |account| + acc = Sale.account_data(account.account_id, today,current_user) + if !acc.nil? + @account_data.push({account.title => acc.cnt_acc, account.title + '_amount' => acc.total_acc}) + end + end + else + @account_data = nil + end @top_items = Sale.top_items(today,current_user) @total_foc_items = Sale.total_foc_items(today,current_user) From 84eb657f90c6636fb525f2bd16d5e00f20c87491 Mon Sep 17 00:00:00 2001 From: phyusin Date: Tue, 5 Jun 2018 17:05:25 +0630 Subject: [PATCH 4/4] change route for junction pay --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 8c6a5e0c..f2196b77 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -197,7 +197,7 @@ scope "(:locale)", locale: /en|mm/ do post 'payment/voucher' => 'voucher_payments#create' post 'payment/paymal' => 'paymal#create' post 'payment/alipay' => 'alipay#create' - post 'payment/junctionpay' => 'junctionpay#create' + post 'payment/junctionpay' => 'junction_pay#create' post 'payment/dinga' => 'dinga#create' post 'payment/gift_voucher' => 'gift_voucher#create'