From e1e7064e47cc7a36b3449729fe6270a70d897f79 Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 12 Jun 2017 18:33:09 +0630 Subject: [PATCH 1/9] add menu in Transaction --- app/models/order.rb | 1 - app/views/layouts/_header.html.erb | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/order.rb b/app/models/order.rb index 5a4d6e2d..d3a3536d 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -244,7 +244,6 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") .where("sales.sale_status='completed'") -<<<<<<< HEAD .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index bdd146b7..c5bd61e0 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -27,8 +27,8 @@
  • From 92f1f80acb0167790919c28d90c1384f0f4800e8 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 12 Jun 2017 18:50:06 +0630 Subject: [PATCH 2/9] Edit Customer --- app/controllers/origami/customers_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 30ead5b0..14af5f49 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -28,6 +28,9 @@ class Origami::CustomersController < BaseOrigamiController # if @membership["status"] == true # @member_group = @membership["data"] # end + # puts "Errrrrrrrrrrrrrrrrr" + # puts @crm_customer.valid? + respond_to do |format| # format.html { render :template => "crm/customers/index" } From 6945449523d0247d159cf0f8a24fb274d631bd93 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 18:51:02 +0630 Subject: [PATCH 3/9] get update --- Gemfile | 2 +- Gemfile.lock | 2 ++ app/controllers/crm/customers_controller.rb | 18 +++++++------- app/models/order.rb | 27 ++++++++++----------- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Gemfile b/Gemfile index b08df141..02dca6af 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0' gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -# gem 'pg' +gem 'pg' # redis server for cable # gem 'redis', '~> 3.0' diff --git a/Gemfile.lock b/Gemfile.lock index 6a7c6340..4235d035 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,6 +110,7 @@ GEM nokogiri (1.7.2) mini_portile2 (~> 2.1.0) pdf-core (0.7.0) + pg (0.20.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -246,6 +247,7 @@ DEPENDENCIES kaminari (~> 0.16.3) listen (~> 3.0.5) mysql2 (>= 0.3.18, < 0.5) + pg prawn prawn-table puma (~> 3.0) diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 01acd441..ad3bcc50 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -5,7 +5,7 @@ class Crm::CustomersController < BaseCrmController # GET /crm/customers.json def index filter = params[:filter] - + if filter.nil? @crm_customers = Customer.order("customer_id").page(params[:page]) #@products = Product.order("name").page(params[:page]).per(5) @@ -31,7 +31,7 @@ class Crm::CustomersController < BaseCrmController # GET /crm/customers/1.json def show @orders = Order.where("customer_id=?", params[:id]) - + if @orders @order_items = [] @orders.each do |bo| @@ -57,7 +57,7 @@ class Crm::CustomersController < BaseCrmController def create @crm_customers = Customer.new(customer_params) - + respond_to do |format| if @crm_customers.save name = customer_params[:name] @@ -72,7 +72,7 @@ class Crm::CustomersController < BaseCrmController url = membership.gateway_url.to_s + memberaction.gateway_url.to_s response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, - date_of_birth: date_of_birth, + dob: date_of_birth, member_group_id: member_group_id,merchant_uid:merchant_uid}.to_json, :headers => { 'Content-Type' => 'application/json', @@ -81,18 +81,18 @@ class Crm::CustomersController < BaseCrmController ) if response["status"] == true - + customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_id: response["customer_datas"]["id"]) - + if params[:sale_id] format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer', notice: 'Customer was successfully created.' } else format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created'} - end + end # format.json { render :index, status: :created, location: @crm_customers } else - + @crm_customers.destroy if params[:sale_id] format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} @@ -103,7 +103,7 @@ class Crm::CustomersController < BaseCrmController else if params[:sale_id] - format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} + format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} else format.html { redirect_to crm_customers_path} format.json { render json: @crm_customers.errors, status: :unprocessable_entity } diff --git a/app/models/order.rb b/app/models/order.rb index 5a4d6e2d..20d9a7f0 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -244,21 +244,20 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sales on sales.sale_id = bookings.sale_id") .where("sales.sale_status='completed'") -<<<<<<< HEAD - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id") end - #Origami: Cashier : to view booking order Table - def self.get_booking_order_table - booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, - bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") - .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") - .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") - .joins("left join orders on orders.order_id = booking_orders.order_id") - .joins("left join sales on sales.sale_id = bookings.sale_id") - .where("sales.sale_status<>'completed' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id,sales.customer_id,orders.order_id") - end + # #Origami: Cashier : to view booking order Table + # def self.get_booking_order_table + # booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, + # bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") + # .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") + # .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") + # .joins("left join orders on orders.order_id = booking_orders.order_id") + # .joins("left join sales on sales.sale_id = bookings.sale_id") + # .where("sales.sale_status<>'completed' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) + # .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id,sales.customer_id,orders.order_id") + # end #Origami: Cashier : to view order type Room def self.get_booking_order_rooms @@ -272,7 +271,7 @@ class Order < ApplicationRecord .joins("left join sale_orders on sale_orders.order_id = orders.order_id") .joins("left join sales on sales.sale_id = sale_orders.sale_id") .where("sales.sale_status<>'completed' and sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id") + .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id,orders.order_id") end #Origami: Cashier : to view order type Room From 796d511f2e659477be65fcd65c5a048382cf77ae Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 12 Jun 2017 19:02:20 +0630 Subject: [PATCH 4/9] Rebate add --- app/models/sale_payment.rb | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index b8c527af..1acd8b57 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -60,7 +60,7 @@ class SalePayment < ApplicationRecord #record an payment in sale-audit remark = "No outstanding Amount - Grand Total [#{invoice.grand_total}] | Due [#{amount_due}] | Paid [#{invoice.amount_received}]" sale_audit = SaleAudit.record_payment(invoice.id, remark,action_by) - + return false, "No outstanding Amount" end @@ -217,7 +217,7 @@ class SalePayment < ApplicationRecord self.sale.sale_status = "completed" self.sale.save! table_update_status(sObj) - rebat() + rebat(sObj) end end @@ -233,8 +233,25 @@ class SalePayment < ApplicationRecord end end - def rebat + def rebat(sObj) + food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) + generic_customer_id = sObj.customer.membership_id + total_amount = sObj.total_amount + receipt_no = sObj.receipt_no + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("rebate") + campaign_type_id = memberaction.additional_parameter["campaign_type_id"] + app_token = membership.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + puts url + response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, + receipt_no: receipt_no}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }) + puts response.to_json end private From 4bbf65104084e6205d375c11fb4b567e22d27047 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 12 Jun 2017 19:31:01 +0630 Subject: [PATCH 5/9] Rebate Bug Fix --- app/models/sale_payment.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 1acd8b57..04668575 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -236,14 +236,13 @@ class SalePayment < ApplicationRecord def rebat(sObj) food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) generic_customer_id = sObj.customer.membership_id - total_amount = sObj.total_amount + total_amount = food_prices receipt_no = sObj.receipt_no membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("rebate") campaign_type_id = memberaction.additional_parameter["campaign_type_id"] app_token = membership.auth_token.to_s url = membership.gateway_url.to_s + memberaction.gateway_url.to_s - puts url response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, receipt_no: receipt_no}.to_json, :headers => { From c904451110a0697b50ba4e6622f9c5df96677a3b Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 19:35:05 +0630 Subject: [PATCH 6/9] update --- app/controllers/api/bill_controller.rb | 12 +++++++++--- app/controllers/origami/payments_controller.rb | 4 ++-- db/seeds.rb | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index 193a4a45..a01cc717 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -8,9 +8,15 @@ class Api::BillController < Api::ApiController #create Bill by Booking ID if (params[:booking_id]) - @sale = Sale.new - @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name) - + booking = Booking.find(params[:booking_id]) + if booking + if booking.sale_id.nil? + @sale = Sale.new + @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name) + else + @status = true + end + end elsif (params[:order_id]) @sale = Sale.new @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 290a2911..134c9474 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -24,8 +24,8 @@ class Origami::PaymentsController < BaseOrigamiController if spay.payment_method == "cash" @cash = spay.payment_amount end - if spay.payment_method == "mpu" - @other = spay.payment_amount + if spay.payment_method == "mpu" || spay.payment_method == "paypar" + @other += spay.payment_amount end end end diff --git a/db/seeds.rb b/db/seeds.rb index 28cbe535..c802079f 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -157,7 +157,7 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance", ]) payment_methods = PaymentMethodSetting.create({payment_method:"MPU",gateway_url: "http//192.168.1.47:3006"}) -payment_methods = PaymentMethodSetting.create({payment_method:"JCB",gateway_url: "http//192.168.1.47:3006"}) + payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http://192.168.1.47:3006",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) From 1d1a913732ca944bdf2b4e8c5f31189c579576bd Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 12 Jun 2017 20:11:37 +0630 Subject: [PATCH 7/9] bug fix for order completed --- app/assets/javascripts/cable.js | 8 ++--- app/assets/javascripts/origami.js | 16 +++++----- .../origami/discounts_controller.rb | 8 +++-- app/models/order.rb | 31 +++++++++---------- app/views/origami/home/index.html.erb | 16 +++++++++- config/routes.rb | 2 +- 6 files changed, 49 insertions(+), 32 deletions(-) diff --git a/app/assets/javascripts/cable.js b/app/assets/javascripts/cable.js index ce5ac871..43efe3f2 100644 --- a/app/assets/javascripts/cable.js +++ b/app/assets/javascripts/cable.js @@ -6,9 +6,9 @@ //= require_tree ./channels // Temp Disable -// (function() { -// this.App || (this.App = {}); +(function() { + this.App || (this.App = {}); -// App.cable = ActionCable.createConsumer(); + App.cable = ActionCable.createConsumer(); -// }).call(this); +}).call(this); diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 4af97d29..da768fb2 100644 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -68,11 +68,12 @@ $(document).ready(function(){ // Receipt Header receipt_no = result[i].receipt_no; cashier = result[i].cashier_name; - receipt_date = result[i].receipt_date; + receipt_date = new Date(result[i].receipt_date); + show_date = receipt_date.getDate() + "-" + receipt_date.getMonth() + "-" + receipt_date.getFullYear() + ' ' + receipt_date.getHours()+ ':' + receipt_date.getMinutes() $("#receipt_no").text(receipt_no); $("#cashier").text(cashier == null ? "" : cashier); - $("#receipt_date").text(receipt_date); + $("#receipt_date").text(show_date); //Receipt Charges @@ -132,7 +133,8 @@ $(document).ready(function(){ }); // Pay Discount for Payment - $("#pay-discount").on('click', function(){ + $("#pay-discount").on('click', function(e){ + e.preventDefault(); var sale_id = $('#sale-id').text(); var sale_item_id = $('.selected-item').attr('id'); var sub_total = $('#order-sub-total').text(); @@ -140,10 +142,10 @@ $(document).ready(function(){ var discount_type = $('#discount-type').val(); var discount_value = $('#discount-amount').val(); var discount_amount = discount_value; + var ajax_url = "/origami/" + sale_id + "/discount"; - if(sale_item_id == null){ - alert('Please select item row to discount!'); - return; + if(sale_item_id != null){ + ajax_url = "/origami/" + sale_item_id + "/discount"; } // For Percentage Discount @@ -154,7 +156,7 @@ $(document).ready(function(){ var params = {'sale_id': sale_id, 'sale_item_id': sale_item_id, 'grand_total' : grand_total, 'discount_type':discount_type, 'discount_value':discount_value, 'discount_amount':discount_amount}; $.ajax({ type: "POST", - url: "/origami/" + sale_item_id + "/discount", + url: ajax_url, data: params, success:function(result){ } }); diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index e80ca348..fb981a80 100644 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -30,13 +30,15 @@ class Origami::DiscountsController < BaseOrigamiController sale.save #save sale item for discount - origin_sale_item = SaleItem.find(sale_item_id) + if sale_item_id != nil + origin_sale_item = SaleItem.find(sale_item_id) + end sale_item = SaleItem.new #pull sale_item.sale_id = sale_id - sale_item.product_code = origin_sale_item.product_code - sale_item.product_name = origin_sale_item.product_name + " Discount" + sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id + sale_item.product_name = "Overall Discount" sale_item.remark = remark sale_item.qty = 1 diff --git a/app/models/order.rb b/app/models/order.rb index d3a3536d..0c00ea84 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -223,7 +223,7 @@ class Order < ApplicationRecord #Origami: Cashier : to view booking order Table def self.get_booking_order_table - booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, + booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, sales.sale_status as sale_status, orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id, bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") @@ -232,7 +232,6 @@ class Order < ApplicationRecord .joins("left join sales on sales.sale_id = bookings.sale_id") .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.order_id") - end #Origami: Cashier : to view booking order Table @@ -248,20 +247,20 @@ class Order < ApplicationRecord end #Origami: Cashier : to view booking order Table - def self.get_booking_order_table - booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, - bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") - .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") - .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") - .joins("left join orders on orders.order_id = booking_orders.order_id") - .joins("left join sales on sales.sale_id = bookings.sale_id") - .where("sales.sale_status<>'completed' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) - .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id,sales.customer_id,orders.order_id") - end + # def self.get_booking_order_table + # booking_orders = Booking.select("sales.receipt_no,orders.status as order_status, + # bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") + # .joins("left join booking_orders on booking_orders.booking_id = bookings.booking_id") + # .joins("left join dining_facilities on dining_facilities.id = bookings.dining_facility_id") + # .joins("left join orders on orders.order_id = booking_orders.order_id") + # .joins("left join sales on sales.sale_id = bookings.sale_id") + # .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::TABLE_TYPE,true) + # .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.status,orders.customer_id,sales.customer_id,orders.order_id") + # end #Origami: Cashier : to view order type Room def self.get_booking_order_rooms - booking_rooms = Booking.select("sales.receipt_no,orders.status as order_status, + booking_rooms = Booking.select("sales.receipt_no,orders.status as order_status, sales.sale_status as sale_status, orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id, bookings.booking_id,orders.customer_id as customer_id, sales.sale_id as sale_id,dining_facilities.name as room_name") @@ -270,7 +269,7 @@ class Order < ApplicationRecord .joins("left join orders on orders.order_id = booking_orders.order_id") .joins("left join sale_orders on sale_orders.order_id = orders.order_id") .joins("left join sales on sales.sale_id = sale_orders.sale_id") - .where("sales.sale_status<>'completed' and sales.sale_status<>'complete' and booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) + .where("booking_orders.order_id IS NOT NULL and dining_facilities.type=? and dining_facilities.is_active=?",DiningFacility::ROOM_TYPE,true) .group("bookings.booking_id,sales.receipt_no,orders.status,sales.sale_id,dining_facilities.name,orders.customer_id") end @@ -291,7 +290,7 @@ class Order < ApplicationRecord def self.get_orders from = Time.now.beginning_of_day.utc to = Time.now.end_of_day.utc - orders = Order.select("orders.order_id as order_id,sales.receipt_no,orders.status as order_status, + orders = Order.select("orders.order_id as order_id,sales.receipt_no,orders.status as order_status, sales.sale_status as sale_status, orders.order_id as order_id,sales.customer_id as sale_customer_id,orders.customer_id as order_customer_id ,bookings.booking_id,sales.sale_id as sale_id,dining_facilities.name as table_name") .joins("left join booking_orders on booking_orders.order_id = orders.order_id @@ -300,7 +299,7 @@ class Order < ApplicationRecord left join order_items on order_items.order_id = orders.order_id left join sale_orders on sale_orders.order_id = orders.order_id left join sales on sales.sale_id = sale_orders.sale_id") - .where("sales.sale_status<>'completed' and dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) + .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,orders.customer_id") end diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 0332fa12..77fb4df0 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -87,6 +87,11 @@
    <% @booking_orders.each do |bko| + # No Show completed + if bko.sale_status == 'completed' + next + end + # Assigned Id for new Order? Sale? unique_id="" customer_id="" @@ -145,6 +150,11 @@
    <% @booking_rooms.each do |rmo| + # No Show completed + if rmo.sale_status == 'completed' + next + end + # Assigned Id for new Order? Sale? unique_id="" customer_id="" @@ -204,6 +214,10 @@
    <% @orders.each do |odr| + # No Show completed + if odr.sale_status == 'completed' + next + end # Assigned Id for new Order? Sale? unique_id="" customer_id="" @@ -319,7 +333,7 @@ sub_total = 0 if @selected_item_type == "Order" @selected_item.order_items.each do |order_item| - sub_total += order_item.qty*order_item.unit_price + sub_total += (order_item.qty*order_item.unit_price) %> <%= order_item.item_name %> diff --git a/config/routes.rb b/config/routes.rb index 3b15f5dd..76e1498c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -9,7 +9,7 @@ Rails.application.routes.draw do mount Sidekiq::Web => '/kiq' # Action Cable Creation - # mount ActionCable.server => "/cable" + mount ActionCable.server => "/cable" #--------- SmartSales Installation ------------# get 'install' => 'install#index' From a8a8c2b984f5de4a5164217d74e42a5dbcaaa2f8 Mon Sep 17 00:00:00 2001 From: Nweni Date: Mon, 12 Jun 2017 20:15:26 +0630 Subject: [PATCH 8/9] update --- app/views/origami/home/index.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 0332fa12..5ee5ae3e 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -60,7 +60,7 @@ -

    <%= cpo.table_name %>

    +

    <%= cpo.table_name %>

    Receipt No : @@ -96,7 +96,7 @@ unique_id=bko.booking_id customer_id=bko.order_customer_id # check selected item and assign - if @selected_item != nil + if !@selected_item.nil? if bko.order_id == @selected_item.order_id sale_status = sale_status + " selected-item" end From 29acbd9bfa8eef7f0c03b74fa4fae044ca005844 Mon Sep 17 00:00:00 2001 From: Phyo Date: Mon, 12 Jun 2017 20:32:12 +0630 Subject: [PATCH 9/9] Rebate Redeem amount detect --- app/models/sale_payment.rb | 41 +++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 04668575..ffe881e6 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -236,21 +236,34 @@ class SalePayment < ApplicationRecord def rebat(sObj) food_prices, beverage_prices = SaleItem.calculate_food_beverage(sObj.sale_items) generic_customer_id = sObj.customer.membership_id - total_amount = food_prices - receipt_no = sObj.receipt_no - membership = MembershipSetting.find_by_membership_type("paypar_url") - memberaction = MembershipAction.find_by_membership_type("rebate") - campaign_type_id = memberaction.additional_parameter["campaign_type_id"] - app_token = membership.auth_token.to_s - url = membership.gateway_url.to_s + memberaction.gateway_url.to_s - response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, - receipt_no: receipt_no}.to_json, - :headers => { - 'Content-Type' => 'application/json', - 'Accept' => 'application/json' - }) + if generic_customer_id != nil || generic_customer_id != "" + paypar = sObj.sale_payments + payparcost = 0 + paypar.each do |pp| + if pp.payment_method == "paypar" + payparcost = payparcost + pp.payment_amount + end + end + total_amount = food_prices - payparcost + puts "aaaa" + puts food_prices + puts payparcost + puts total_amount + receipt_no = sObj.receipt_no + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("rebate") + campaign_type_id = memberaction.additional_parameter["campaign_type_id"] + app_token = membership.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + response = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,total_amount: total_amount,campaign_type_id: campaign_type_id, + receipt_no: receipt_no}.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json' + }) - puts response.to_json + puts response.to_json + end end private