diff --git a/app/assets/javascripts/CRM.js b/app/assets/javascripts/CRM.js index c7457bed..4b5baba8 100644 --- a/app/assets/javascripts/CRM.js +++ b/app/assets/javascripts/CRM.js @@ -18,4 +18,5 @@ //= require cable //= require jquery-ui //= require bootstrap-datepicker -//= require bootstrap/modal \ No newline at end of file +//= require bootstrap/modal + diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index ce21f509..2097db44 100644 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -11,6 +11,7 @@ // about supported directives. // //= require jquery +//= require tether //= require bootstrap //= require jquery_ujs //= require turbolinks diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index bcd9d62b..eba40816 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -28,6 +28,10 @@ class Api::BillController < Api::ApiController @status = false @error_message = "No Current Open Shift" end + + #@sale_data = Sale.find_by_sale_id(@sale_id) + #@sale_items = SaleItem.where("sale_id=?",@sale_id) + # Not Use for these printed bill cannot give customer # @sale_data = Sale.find_by_sale_id(@sale_id) # @sale_items = SaleItem.where("sale_id=?",@sale_id) @@ -47,11 +51,12 @@ class Api::BillController < Api::ApiController # # Calculate Price by accounts # item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items) + #customer= Customer.find(@sale_data.customer_id) + # get member information + #member_info = Customer.get_member_account(customer) # printer = Printer::ReceiptPrinter.new(print_settings) # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details) - - end diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index f67d413c..4606b049 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -115,18 +115,22 @@ class Crm::CustomersController < BaseCrmController 'Content-Type' => 'application/json', 'Accept' => 'application/json' }, - :timeout => 10 + :timeout => 100 ) - - rescue Net::OpenTimeout - response = { status: false } - rescue OpenURI::HTTPError - response = { status: false} + rescue HTTParty::Error + response = {status: false, message: "Can't open embership server "} - rescue SocketError - response = { status: false} - end + rescue Net::OpenTimeout + + response = { status: false , message: "Can't open embership server "} + + rescue OpenURI::HTTPError + response = { status: false, message: "Can't open embership server "} + + rescue SocketError + response = { status: false, message: "Can't open embership server "} + end if response["status"] == true customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id ) @@ -141,14 +145,14 @@ class Crm::CustomersController < BaseCrmController customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_type:member_group_id ) if params[:sale_id] - format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created. '} + format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created.' + response[:message]} else - format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created. ' } + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' + response[:message] } end end else if params[:sale_id] - format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created. '} + format.html { redirect_to '/origami/'+params[:sale_id]+'/customers', notice: 'Customer was successfully created. noted'} else format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created. ' } end @@ -252,7 +256,7 @@ end ) rescue Net::OpenTimeout response = { status: false } - + rescue OpenURI::HTTPError response = { status: false} diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb index dea66941..72f910bc 100644 --- a/app/controllers/settings/order_queue_stations_controller.rb +++ b/app/controllers/settings/order_queue_stations_controller.rb @@ -77,7 +77,7 @@ class Settings::OrderQueueStationsController < ApplicationController # params.require(:order_queue_station).permit(:station_name, :is_active, :auto_print, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by) # ======= # Don't Know { zone_ids: [] } - params.require(:order_queue_station).permit(:station_name, :is_active, :processing_items, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by,{ zone_ids: [] }) + params.require(:order_queue_station).permit(:station_name, :is_active, :processing_items, :auto_print, :print_copy, :printer_name, :font_size, :cut_per_item, :use_alternate_name, :created_by,{ zone_ids: [] }) # >>>>>>> b093a993ba002c92659bbb34338c55c031c11d87 end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 16d70db7..60cf8b14 100644 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -27,16 +27,19 @@ class Customer < ApplicationRecord 'Content-Type' => 'application/json', 'Accept' => 'application/json' }, - :timeout => 10 + :timeout => 100 ) + rescue HTTParty::Error + response = {status: false, message: "Server Error"} + rescue Net::OpenTimeout - response = { status: false } + response = { status: false , message: "Server Time out"} rescue OpenURI::HTTPError - response = { status: false} + response = { status: false, message: "Can't connect server"} rescue SocketError - response = { status: false} + response = { status: false, message: "Can't connect server"} end return response; @@ -60,13 +63,13 @@ class Customer < ApplicationRecord :timeout => 10 ) rescue Net::OpenTimeout - response = { status: false } - + response = { status: false , message: "Server Time out"} + rescue OpenURI::HTTPError - response = { status: false} + response = { status: false, message: "Can't connect server"} rescue SocketError - response = { status: false} + response = { status: false, message: "Can't connect server"} end return response; diff --git a/app/models/sale.rb b/app/models/sale.rb index 06552010..0e767ea0 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -281,8 +281,8 @@ class Sale < ApplicationRecord # sale_tax.tax_payable_amount = total_taxable * tax.rate # substract , to give after discount - total_taxable = total_taxable - total_discount - sale_tax.tax_payable_amount = total_taxable * tax.rate / 100 + total_tax = total_taxable - total_discount + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 #new taxable amount is standard rule for step by step # total_taxable = total_taxable + sale_tax.tax_payable_amount diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 1d8a0e99..fb1e58d8 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -306,16 +306,22 @@ class SalePayment < ApplicationRecord if generic_customer_id != nil || generic_customer_id != "" || generic_customer_id != 0 paypar = sObj.sale_payments payparcost = 0 + credit = 0 paypar.each do |pp| if pp.payment_method == "paypar" payparcost = payparcost + pp.payment_amount + elsif pp.payment_method == "creditnote" + credit = 1 end end # overall_dis = SaleItem.get_overall_discount(sObj.id) overall_dis = sObj.total_discount total_amount = rebate_prices - payparcost - overall_dis - if total_amount > 0 + if credit == 1 + total_amount = 0 + end + if total_amount >= 0 receipt_no = sObj.receipt_no membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("rebate") @@ -331,15 +337,15 @@ class SalePayment < ApplicationRecord :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' - }, :timeout => 10) + }, :timeout => 100) rescue Net::OpenTimeout - response = { status: false } + response = { status: false , message: "Server Time out"} rescue OpenURI::HTTPError - response = { status: false} + response = { status: false, message: "Can't connect server"} rescue SocketError - response = { status: false} + response = { status: false, message: "Can't connect server"} end return response # puts response.to_json diff --git a/app/views/origami/shifts/show.html.erb b/app/views/origami/shifts/show.html.erb index 9fa8020d..225b0036 100644 --- a/app/views/origami/shifts/show.html.erb +++ b/app/views/origami/shifts/show.html.erb @@ -32,7 +32,7 @@