From a5546920b6d4675bac38498f84f9a5362ebdad76 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 18 Jul 2017 16:06:36 +0630 Subject: [PATCH] nfc done --- app/controllers/home_controller.rb | 2 +- app/controllers/oqs/home_controller.rb | 2 +- .../origami/customers_controller.rb | 16 +++++++-- .../origami/other_charges_controller.rb | 1 + app/views/crm/customers/index.html.erb | 18 +++++----- app/views/layouts/_header.html.erb | 2 ++ app/views/origami/customers/index.html.erb | 34 +++++++++++++----- app/views/origami/home/index.html.erb | 3 +- dump.rdb | Bin 18311 -> 466 bytes 9 files changed, 54 insertions(+), 24 deletions(-) diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index a601e4b8..fb42bfee 100644 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -85,7 +85,7 @@ class HomeController < ApplicationController if !shift.nil? redirect_to origami_root_path else - redirect_to crm_customers_path + redirect_to dashboard_path end elsif employee.role == "cashier" #check if cashier has existing open cashier diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 28645a74..c79c971c 100644 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -112,7 +112,7 @@ class Oqs::HomeController < BaseOqsController left join booking_orders as bo on bo.order_id = assigned_order_items.order_id left join bookings as bk on bk.booking_id = bo.booking_id left join dining_facilities as df on df.id = bk.dining_facility_id") - .where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at <= ?", Time.now.end_of_day.utc) + .where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at between #{Time.now.beginning_of_day.utc} and #{Time.now.end_of_day.utc}") .group("assigned_order_items.order_id") diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 203e5600..26e3c74b 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -50,12 +50,22 @@ class Origami::CustomersController < BaseOrigamiController def update_sale_by_customer id = params[:sale_id][0,3] + customer_id = params[:customer_id] + + # Check and find with card no + if(!customer_id.include? "CUS") + customer = Customer.find_by_paypar_account_no(customer_id) + if(customer != nil) + customer_id = customer.customer_id + end + end + if(id == "SAL") sale = Sale.find(params[:sale_id]) - status = sale.update_attributes(customer_id: params[:customer_id]) + status = sale.update_attributes(customer_id: customer_id) sale.sale_orders.each do |sale_order| order = Order.find(sale_order.order_id) - status = order.update_attributes(customer_id: params[:customer_id]) + status = order.update_attributes(customer_id: customer_id) end else @booking = BookingOrder.find_by_order_id(params[:sale_id]) @@ -63,7 +73,7 @@ class Origami::CustomersController < BaseOrigamiController @orders.each do |bo| order = Order.find(bo.order_id) - status = order.update_attributes(customer_id: params[:customer_id]) + status = order.update_attributes(customer_id: customer_id) end end diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb index bb0d9e42..b0e6472c 100644 --- a/app/controllers/origami/other_charges_controller.rb +++ b/app/controllers/origami/other_charges_controller.rb @@ -37,6 +37,7 @@ class Origami::OtherChargesController < BaseOrigamiController sale_item.unit_price = di["price"] sale_item.taxable_price = 0 sale_item.is_taxable = 0 + sale_item.account_id = 0 sale_item.price = di["price"] sale_item.save diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index a73fd08f..71b90b1b 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -23,15 +23,15 @@ <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %> -
- - - +
+ +
<% end %> + @@ -102,13 +102,11 @@ $(function() { var cardNo = ""; $("#sxModal").show(); setTimeout(function(){ - getCardNo; - $("#sxModal").hide(); - },5000); -alert($("#search").val()); - $("#filter_form").submit(); + getCardNo(); + $("#sxModal").hide(); + $("#filter_form").submit(); + },100); }); - }); $(document).on('click',".customer_tr",function(){ diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index fd951d6c..2a0684a1 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -45,6 +45,8 @@
  • <%= link_to "Shift Sale Report", reports_shiftsale_index_path, :tabindex =>"-1" %>
    • +
  • +
    • diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index a9079efe..b11488b4 100644 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -12,20 +12,20 @@
    - +
    @@ -94,8 +94,7 @@
    - <%= #f.input :paypar_account_no, :id => "paypar_account_no", :class => "form-control" %> - +
    @@ -224,6 +223,23 @@ $("#sxModal").hide(); },100); }); + + // Read Card Reader + $("#member_acc_no").on('click', function(e){ + var cardNo = ""; + var sale_id = $("#sale_id").val() || 0; + var customer_mamber_card_no = 0; + $("#sxModal").show(); + setTimeout(function(){ + getCardNo(); + $("#sxModal").hide(); + customer_mamber_card_no = $("#search").val(); + + if(sale_id != 0 && customer_mamber_card_no != 0){ + update_sale(customer_mamber_card_no,sale_id); + } + },100); + }); }); @@ -236,6 +252,7 @@ function setCardNo(cardNo){ if(cardNo.length == 16){ $("#paypar_account_no").val(cardNo); + $("#search").val(cardNo); } } @@ -253,6 +270,7 @@ var url = "customers/"+customer_id; } + // Need To Clean? $.ajax({ type: "GET", url: url, diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 3afea88d..77d85f10 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -107,7 +107,8 @@ - + + diff --git a/dump.rdb b/dump.rdb index 915b246254cbbdb2d38072a0e1549d44ad9b34c9..2747d9732713057f3a828b18fa930f51ba657f37 100644 GIT binary patch delta 147 zcmZqgXS~Eb!NBmq)!fKm9HqsnDZ06-xrc775oP$t@SBa1L9DnWvBWAZF*7GM#mdOQ z&|KHRT-VUzz{H8F0(@Y(f};H7)MB8{1Ctf(CAh(|41ea{;0~R<%l3t#xq-2nnVx~6 lk(r^fDQjVAW@-s*T4GLdDg!r?(FYj*PxE6r^;+heJOHp{HPHY7 literal 18311 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
    <% path ="/origami/#{@sale_id}/customers" %> - <%= form_tag path, :method => :get do %> -
    - - - + <%= form_tag path, :id => "filter_form", :method => :get do %> +
    + +
    <% end %> +