From 20333f6a2e08d66e581527b11a479b6bc66488bd Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Wed, 14 Mar 2018 09:57:08 +0630 Subject: [PATCH 01/30] Add image in login page --- app/assets/stylesheets/login.scss | 4 ++ app/views/layouts/login_dashboard.html.erb | 80 ++++++++++++++++------ 2 files changed, 64 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index b5f29da6..56566121 100755 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -90,3 +90,7 @@ padding-bottom: 20px; font-size: 14px; } + +.style_image{ + height : 107px; +} diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb index f2f6f958..064dd572 100755 --- a/app/views/layouts/login_dashboard.html.erb +++ b/app/views/layouts/login_dashboard.html.erb @@ -158,11 +158,19 @@
- <% end %> <% end %> @@ -173,11 +181,19 @@
- <% end %> <% end %> @@ -189,11 +205,19 @@
- <% end %> <% end %> @@ -205,11 +229,19 @@
- <% end %> <% end %> @@ -221,11 +253,19 @@
- <% end %> <% end %> From 96f8640df798c86b220beb69bdee4391f2e5b180 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Thu, 15 Mar 2018 13:46:40 +0630 Subject: [PATCH 02/30] Edit Dashboard's photo and Add Bread Crumb Name --- app/assets/javascripts/origami.js | 43 ++++++++++++++++++- app/assets/stylesheets/login.scss | 9 +++- app/controllers/origami/jcb_controller.rb | 1 - app/controllers/origami/master_controller.rb | 1 - app/controllers/origami/mpu_controller.rb | 1 - .../origami/redeem_payments_controller.rb | 1 - app/controllers/origami/surveys_controller.rb | 1 - .../origami/unionpay_controller.rb | 1 - app/controllers/origami/visa_controller.rb | 1 - app/views/layouts/_header.html.erb | 15 ++----- app/views/layouts/login_dashboard.html.erb | 10 ++--- app/views/origami/addorders/detail.html.erb | 1 + app/views/origami/cash_ins/new.html.erb | 3 ++ app/views/origami/cash_mgmt/index.html.erb | 2 +- app/views/origami/cash_mgmt/new.html.erb | 3 ++ app/views/origami/cash_outs/new.html.erb | 4 +- .../origami/credit_payments/index.html.erb | 1 + app/views/origami/customers/index.html.erb | 4 ++ app/views/origami/dashboard/index.html.erb | 3 ++ app/views/origami/discounts/index.html.erb | 1 + app/views/origami/home/index.html.erb | 1 + app/views/origami/home/show.html.erb | 1 + app/views/origami/in_duties/_form.html.erb | 1 + app/views/origami/in_duties/index.html.erb | 1 + app/views/origami/jcb/index.html.erb | 1 + app/views/origami/master/index.html.erb | 1 + .../origami/moveroom/move_dining.html.erb | 1 + .../origami/movetable/move_dining.html.erb | 1 + app/views/origami/mpu/index.html.erb | 1 + app/views/origami/orders/show.html.erb | 1 + .../origami/other_charges/index.html.erb | 3 +- .../origami/others_payments/index.html.erb | 3 ++ app/views/origami/payments/show.html.erb | 1 + .../origami/paypar_payments/index.html.erb | 7 ++- .../origami/pending_order/index.html.erb | 3 ++ .../load_commissioners.html.erb | 1 + .../origami/redeem_payments/index.html.erb | 1 + .../origami/room_invoices/index.html.erb | 1 + app/views/origami/rooms/show.html.erb | 1 + app/views/origami/sale_edit/edit.html.erb | 2 + .../origami/second_display/index.html.erb | 1 + app/views/origami/shifts/show.html.erb | 3 ++ app/views/origami/split_bill/index.html.erb | 1 + app/views/origami/surveys/_form.html.erb | 1 + .../origami/table_invoices/index.html.erb | 1 + .../origami/table_invoices/show.html.erb | 1 + app/views/origami/unionpay/index.html.erb | 1 + app/views/origami/visa/index.html.erb | 1 + app/views/origami/voucher/index.html.erb | 2 + 49 files changed, 122 insertions(+), 29 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 418b6ebe..4dda94e2 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -16,6 +16,43 @@ //= require BSBMaterial/demo.js //= require custom.js +/* Constant Varaibles */ +_ADD_ORDER_ = "/   ADD ORDER"; +_CASH_IN_ = "/   CASH IN"; +_CASH_OUT_ = "/   CASH OUT"; +_CASH_MGMT_ = "/   CASH MGMT"; +_CREDIT_PAYMENTS_ = "/   CREDIT PAYMENTS"; +_CUSTOMERS_ = "/   CUSTOMERS"; +_DASHBOARD_ = "/   DASHBOARD"; +_DISCOUNTS_ = "/   DISCOUNTS"; +_CASHIER_ = "/   CASHIER"; +_IN_DUTIES_ = "/   IN DUTIES"; +_JCB_ = "/   JCB PAYMENT"; +_MASTER_ = "/   MASTER PAYMENT"; +_MOVE_ROOM_ = "/   MOVE ROOM"; +_MOVE_TABLE_ = "/   MOVE TABLE"; +_MPU_ = "/   MPU PAYMENT"; +_ORDERS_ = "/   ORDERS"; +_OTHER_CHARGES_ = "/   OTHER CHARGES"; +_OTHER_PAYMENTS_ = "/   OTHER PAYMENTS"; +_PAYMENTS_ = "/   PAYMENTS"; +_PAYPAR_PAYMENT_ = "/   PAYPAR PAYMENT"; +_PENDING_ORDER_ = "/   PENDING ORDER"; +_PRODUCT_COMMISSIONS_= "/   PRODUCT COMMISSIONS"; +_REDEEM_PAYMENT_ = "/   REDEEM PAYMENT"; +_ROOM_INVOICES_ = "/   ROOM INVOICES"; +_ROOM_ = "/   ROOM"; +_SALE_EDIT_ = "/   SALE EDIT"; +_SECOND_DISPLAY_ = "/   CUSTOMER VIEW"; +_CLOSE_CASHIER_ = "/   CLOSE CASHIER"; +_SPLIT_BILL_ = "/   SPLIT BILL"; +_TABLE_INVOICE_ = "/   TABLE INVOICE"; +_UNION_ = "/   UNION PAYMENT"; +_VISA_ = "/   VISA PAYMENT"; +_VOUCHER_ = "/   VOUCHER"; +_TABLE_ = "/   TABLE"; +_SURVEY_ = "/   SURVEY"; +/* Constant Varaibles */ $(document).on('turbolinks:load', function() { @@ -356,4 +393,8 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun }); } } -//end CB ECR integration \ No newline at end of file +//end CB ECR integration + +function setHeaderBreadCrumb(params){ + $("#others_payment").html(params); +} \ No newline at end of file diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index 56566121..ed0b36f9 100755 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -92,5 +92,12 @@ } .style_image{ - height : 107px; + height : 138px; + padding : 20px 0 20px 0; + width : 70%; +} + +.style_icon{ + font-size: 111px; + padding : 20px 0 20px 0; } diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb index 06ee6087..e17c773e 100755 --- a/app/controllers/origami/jcb_controller.rb +++ b/app/controllers/origami/jcb_controller.rb @@ -9,7 +9,6 @@ class Origami::JcbController < BaseOrigamiController @jcbcount = 0 others = 0 - @payment_method_setting_nav = PaymentMethodSetting.all @shop = Shop::ShopDetail if @shop.is_rounding_adj new_total = Sale.get_rounding_adjustment(sale_data.grand_total) diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb index 77ae99d2..95710f11 100755 --- a/app/controllers/origami/master_controller.rb +++ b/app/controllers/origami/master_controller.rb @@ -9,7 +9,6 @@ class Origami::MasterController < BaseOrigamiController @mastercount = 0 others = 0 - @payment_method_setting_nav = PaymentMethodSetting.all @shop = Shop::ShopDetail if @shop.is_rounding_adj new_total = Sale.get_rounding_adjustment(sale_data.grand_total) diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb index c3f74133..f577cb9d 100755 --- a/app/controllers/origami/mpu_controller.rb +++ b/app/controllers/origami/mpu_controller.rb @@ -8,7 +8,6 @@ class Origami::MpuController < BaseOrigamiController @mpucount = 0 others = 0 - @payment_method_setting_nav = PaymentMethodSetting.all @shop = Shop::ShopDetail if @shop.is_rounding_adj new_total = Sale.get_rounding_adjustment(sale_data.grand_total) diff --git a/app/controllers/origami/redeem_payments_controller.rb b/app/controllers/origami/redeem_payments_controller.rb index bcb8f9ae..347fd3ea 100755 --- a/app/controllers/origami/redeem_payments_controller.rb +++ b/app/controllers/origami/redeem_payments_controller.rb @@ -6,7 +6,6 @@ class Origami::RedeemPaymentsController < BaseOrigamiController @membership_rebate_balance=0 sale_data = Sale.find_by_sale_id(@sale_id) - @payment_method_setting_nav = PaymentMethodSetting.all @shop = Shop::ShopDetail # if @shop.is_rounding_adj # new_total = Sale.get_rounding_adjustment(sale_data.grand_total) diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb index 654f8a1a..b30ff1b0 100644 --- a/app/controllers/origami/surveys_controller.rb +++ b/app/controllers/origami/surveys_controller.rb @@ -5,7 +5,6 @@ class Origami::SurveysController < BaseOrigamiController @id = params[:id] @cashier_type = params[:type] - if(@id[0,3] == "SAL") @sale = Sale.find(@id) @receipt_no = @sale.receipt_no diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb index 707a1022..905a1ffb 100644 --- a/app/controllers/origami/unionpay_controller.rb +++ b/app/controllers/origami/unionpay_controller.rb @@ -8,7 +8,6 @@ class Origami::UnionpayController < BaseOrigamiController @unionpaycount = 0 others = 0 - @payment_method_setting_nav = PaymentMethodSetting.all @shop = Shop::ShopDetail if @shop.is_rounding_adj new_total = Sale.get_rounding_adjustment(sale_data.grand_total) diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb index 788704eb..f04ec001 100755 --- a/app/controllers/origami/visa_controller.rb +++ b/app/controllers/origami/visa_controller.rb @@ -8,7 +8,6 @@ class Origami::VisaController < BaseOrigamiController @visacount = 0 others = 0 - @payment_method_setting_nav = PaymentMethodSetting.all @shop = Shop::ShopDetail if @shop.is_rounding_adj new_total = Sale.get_rounding_adjustment(sale_data.grand_total) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index e3e7adda..42fd0200 100755 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -27,12 +27,10 @@ Logo SX Restaurant - <% if @payment_method_setting_nav.present? %> - /   -   Payment - - <% end %> - + + /   + +
@@ -83,11 +81,6 @@ \ No newline at end of file diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb index 8fa9a7af..16c468bd 100644 --- a/app/views/origami/pending_order/index.html.erb +++ b/app/views/origami/pending_order/index.html.erb @@ -39,6 +39,9 @@
\ No newline at end of file diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 42fd0200..23a4aba2 100755 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -10,6 +10,7 @@
--> +<%if !request.path_info.include?('second_display') %> - +<%end%> diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb index cd08965c..246110f5 100644 --- a/app/views/origami/dashboard/index.html.erb +++ b/app/views/origami/dashboard/index.html.erb @@ -189,18 +189,27 @@
<% end %>
- + \ No newline at end of file diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 2f2bf4e3..f1b1629e 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -134,7 +134,7 @@
<% @orders.each do |order| %> -
+
text-white" data-id="<%= order.order_id %>">
<% order_status = "" @@ -424,7 +424,7 @@ reply <%= t("views.btn.back") %> - Customer View + <% if @dining.status != "available" %> @@ -491,11 +491,11 @@
- +
-

- +
-
+
<% if ENV["SERVER_MODE"] != 'cloud' %> -
+
<% end %> @@ -424,27 +426,29 @@
- +

Are you Member?

-
- - -
+ + +
+
+ +
+ +
+ +
+
+
+
+
-
+
- -
- -
- -
- -
@@ -453,7 +457,12 @@
-

Card Tap

+
+

Card Tap

+
+
+ +
\ No newline at end of file diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb index fade7ccb..d7c929f7 100644 --- a/app/views/origami/pending_order/show.html.erb +++ b/app/views/origami/pending_order/show.html.erb @@ -203,11 +203,12 @@ $(document).ready(function(){ url: ajax_url, // data: 'order_id='+ order_id, success: function (result) { + console.log(result) if (!result.status) { swal("Information!", result.error_message); } else { - location.reload(); + window.location.href = '../pending_order/'+ result.data; } } }); diff --git a/app/views/origami/second_display/_second_display.html.erb b/app/views/origami/second_display/_second_display.html.erb index a5ac8872..267be25a 100644 --- a/app/views/origami/second_display/_second_display.html.erb +++ b/app/views/origami/second_display/_second_display.html.erb @@ -4,7 +4,7 @@
-
+
diff --git a/app/views/origami/second_display/index.html.erb b/app/views/origami/second_display/index.html.erb index 899805b2..0fc62a38 100644 --- a/app/views/origami/second_display/index.html.erb +++ b/app/views/origami/second_display/index.html.erb @@ -1,4 +1,4 @@ -
+
<%= render 'slider' %> diff --git a/app/views/origami/split_bill/index.html.erb b/app/views/origami/split_bill/index.html.erb old mode 100644 new mode 100755 index 8e3197b5..772842b5 --- a/app/views/origami/split_bill/index.html.erb +++ b/app/views/origami/split_bill/index.html.erb @@ -624,20 +624,39 @@ function orderItemSplitBillProcess(cnt_items){ } var order_ids = []; + var arr_order_ids = []; if(order_items!=undefined && order_items!=null){ $.each(order_items,function(key,value){ + var orderIds = {}; if($.inArray(value.order_id,order_ids) == -1){ order_ids.push(value.order_id); + orderIds[value.order_id] = 1; + arr_order_ids.push(orderIds); + }else{ + if(arr_order_ids != null & arr_order_ids!=""){ + if(arr_order_ids.length > 0){ + $.each(arr_order_ids, function(k,val){ + $.each(val,function(kk,vval){ + if((val[kk]!= undefined) && (kk == value.order_id)){ + val[kk] += 1; + } + }); + arr_order_ids[k] = val; + }); + } + } } }); } + // console.log(JSON.stringify(arr_order_ids)); + var ajax_url = "/origami/split_bills"; $.ajax({ type: "POST", url: ajax_url, dataType: 'JSON', - data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'order_items' : JSON.stringify(order_items), 'orders' : ''}, + data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : order_ids, 'arr_order_ids': JSON.stringify(arr_order_ids), 'order_items' : JSON.stringify(order_items), 'orders' : ''}, success: function (result) { if (!result.status) { swal("Information!", result.error_message); @@ -670,7 +689,7 @@ function orderSplitBillProcess(cnt_orders){ type: "POST", url: ajax_url, dataType: 'JSON', - data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : [], 'order_items' : '', 'orders' : JSON.stringify(orders)}, + data: {'dining_id' : dining_id, 'type': type, 'customer_id' : customer_id, 'booking_id' : booking_id, 'order_ids' : [], 'order_items' : '', 'orders' : JSON.stringify(orders), 'arr_order_ids': []}, success: function (result) { if (!result.status) { swal("Information!", result.error_message); diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index 8f310dab..02e35bb8 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -20,11 +20,11 @@ class ActionController::Base end else # check for license file - if check_license - current_license(ENV["SX_PROVISION_URL"]) - else - redirect_to activate_path - end + # if check_license + # current_license(ENV["SX_PROVISION_URL"]) + # else + # redirect_to activate_path + # end end end diff --git a/db/migrate/20170403174111_create_sale_audits.rb b/db/migrate/20170403174111_create_sale_audits.rb index e1dcfffd..1cf609df 100755 --- a/db/migrate/20170403174111_create_sale_audits.rb +++ b/db/migrate/20170403174111_create_sale_audits.rb @@ -9,7 +9,7 @@ class CreateSaleAudits < ActiveRecord::Migration[5.1] t.string :action_by, :null => false t.string :approved_by, :null => true t.datetime :approved_at, :null => true - t.string :remark + t.text :remark t.timestamps end end diff --git a/db/migrate/20170628103624_create_print_settings.rb b/db/migrate/20170628103624_create_print_settings.rb index 672953fc..4f27bd0c 100755 --- a/db/migrate/20170628103624_create_print_settings.rb +++ b/db/migrate/20170628103624_create_print_settings.rb @@ -6,13 +6,13 @@ class CreatePrintSettings < ActiveRecord::Migration[5.1] t.string :template t.string :font, :default => "" t.string :printer_name, :null => false - t.string :api_settings, + t.string :api_settings t.string :brand_name t.string :type t.decimal :page_width, :null => false, :default => 210 t.decimal :page_height, :null => false, :default => 1450 t.integer :print_copies, :null => false, :default => 1 - t.string :precision + t.string :precision t.boolean :delimiter t.integer :heading_space From c62637af100c0ce2ad33432cfda35ed3aa6697d8 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Thu, 15 Mar 2018 14:08:30 +0630 Subject: [PATCH 04/30] Remove / from _header --- app/views/layouts/_header.html.erb | 2 +- config/initializers/action_controller.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 23a4aba2..e42f33ec 100755 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -29,7 +29,7 @@ SX Restaurant - /   +
diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index 02e35bb8..2bcdd944 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -19,12 +19,12 @@ class ActionController::Base render :json => [{ status: false, message: 'Invalid Access!'}] end else - # check for license file - # if check_license - # current_license(ENV["SX_PROVISION_URL"]) - # else - # redirect_to activate_path - # end + check for license file + if check_license + current_license(ENV["SX_PROVISION_URL"]) + else + redirect_to activate_path + end end end From 808b123a91849be899f6a7895021e2b66999c725 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Thu, 15 Mar 2018 15:27:11 +0630 Subject: [PATCH 05/30] Add Date in Cashier's Dashboard and remove no need breadcrumb --- app/assets/javascripts/origami.js | 24 ++++--------------- app/views/origami/addorders/detail.html.erb | 1 - app/views/origami/cash_ins/new.html.erb | 3 --- app/views/origami/cash_mgmt/new.html.erb | 4 +--- app/views/origami/cash_outs/new.html.erb | 3 --- app/views/origami/dashboard/index.html.erb | 8 ++----- app/views/origami/home/index.html.erb | 1 - app/views/origami/home/show.html.erb | 1 - .../origami/moveroom/move_dining.html.erb | 1 - .../origami/movetable/move_dining.html.erb | 1 - app/views/origami/orders/show.html.erb | 1 - .../origami/pending_order/index.html.erb | 3 --- .../load_commissioners.html.erb | 2 +- .../origami/room_invoices/index.html.erb | 1 - app/views/origami/rooms/show.html.erb | 1 - .../origami/second_display/index.html.erb | 1 - app/views/origami/shifts/show.html.erb | 3 --- .../origami/table_invoices/index.html.erb | 1 - .../origami/table_invoices/show.html.erb | 1 - config/initializers/action_controller.rb | 2 +- 20 files changed, 9 insertions(+), 54 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 4dda94e2..7f3febba 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -17,40 +17,24 @@ //= require custom.js /* Constant Varaibles */ -_ADD_ORDER_ = "/   ADD ORDER"; -_CASH_IN_ = "/   CASH IN"; -_CASH_OUT_ = "/   CASH OUT"; -_CASH_MGMT_ = "/   CASH MGMT"; _CREDIT_PAYMENTS_ = "/   CREDIT PAYMENTS"; _CUSTOMERS_ = "/   CUSTOMERS"; -_DASHBOARD_ = "/   DASHBOARD"; _DISCOUNTS_ = "/   DISCOUNTS"; -_CASHIER_ = "/   CASHIER"; _IN_DUTIES_ = "/   IN DUTIES"; _JCB_ = "/   JCB PAYMENT"; _MASTER_ = "/   MASTER PAYMENT"; -_MOVE_ROOM_ = "/   MOVE ROOM"; -_MOVE_TABLE_ = "/   MOVE TABLE"; _MPU_ = "/   MPU PAYMENT"; -_ORDERS_ = "/   ORDERS"; -_OTHER_CHARGES_ = "/   OTHER CHARGES"; -_OTHER_PAYMENTS_ = "/   OTHER PAYMENTS"; -_PAYMENTS_ = "/   PAYMENTS"; +_OTHER_CHARGES_ = "/   CHARGES"; +_OTHER_PAYMENTS_ = "/   OTHER PAYMENT"; +_PAYMENTS_ = "/   PAYMENT"; _PAYPAR_PAYMENT_ = "/   PAYPAR PAYMENT"; -_PENDING_ORDER_ = "/   PENDING ORDER"; -_PRODUCT_COMMISSIONS_= "/   PRODUCT COMMISSIONS"; +_COMMISSIONS_ = "/   COMMISSIONS"; _REDEEM_PAYMENT_ = "/   REDEEM PAYMENT"; -_ROOM_INVOICES_ = "/   ROOM INVOICES"; -_ROOM_ = "/   ROOM"; _SALE_EDIT_ = "/   SALE EDIT"; -_SECOND_DISPLAY_ = "/   CUSTOMER VIEW"; -_CLOSE_CASHIER_ = "/   CLOSE CASHIER"; _SPLIT_BILL_ = "/   SPLIT BILL"; -_TABLE_INVOICE_ = "/   TABLE INVOICE"; _UNION_ = "/   UNION PAYMENT"; _VISA_ = "/   VISA PAYMENT"; _VOUCHER_ = "/   VOUCHER"; -_TABLE_ = "/   TABLE"; _SURVEY_ = "/   SURVEY"; /* Constant Varaibles */ diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index aba0f3f7..6c580f40 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -493,7 +493,6 @@ jQuery('.first_'+id).click(); }); $(document).ready(function () { - setHeaderBreadCrumb(_ADD_ORDER_); $(".tables").on('click', function () { $('.tables').css('background-color',''); $('.tables').removeClass('purple') diff --git a/app/views/origami/cash_ins/new.html.erb b/app/views/origami/cash_ins/new.html.erb index 32d5215a..bda159e2 100755 --- a/app/views/origami/cash_ins/new.html.erb +++ b/app/views/origami/cash_ins/new.html.erb @@ -56,9 +56,6 @@
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 8c7ac778..3769505a 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -265,6 +265,17 @@
<%= number_with_precision(0, precision: precision.to_i ) %>
<% end %> + + +
+
+
PAYMAL
+ <% if @paymalcount != 0.0 %> +
<%= number_with_precision(@paymalcount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
+ <% else %> +
<%= number_with_precision(0, precision: precision.to_i ) %>
+ <% end %> +
Balance
<%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
@@ -488,7 +499,7 @@ var customer_name = "<%= @customer.name %>"; $("#credit_payment").show(); } - if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1){ + if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1, parseInt(jQuery.inArray("PAYMAL", payment_type)) !=-1){ $("#card_payment").show(); } else{ $("#card_payment").hide(); @@ -553,6 +564,8 @@ var customer_name = "<%= @customer.name %>"; } else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0){ swal("Oops","Please Pay with Credit Payment","warning"); + }else if(payment_type == "PAYMAL" && $('#paymalcount').text()==0 && sub_total != 0.0){ + swal("Oops","Please Pay with Paymal Payment","warning"); }else{ $( "#loading_wrapper").show(); @@ -826,7 +839,8 @@ var customer_name = "<%= @customer.name %>"; var jcb1 = $('#jcbcount').text(); var master1 = $('#mastercount').text(); var unionpay1 = $('#unionpaycount').text(); - var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1); + var paymal1 = $('#paymalcount').text(); + var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1) + parseFloat(visa1) + parseFloat(paymal1); var total = $('#amount_due').text(); var amt = 0; <% if precision.to_i > 0 %>; @@ -854,8 +868,9 @@ var customer_name = "<%= @customer.name %>"; var jcb = $('#jcbcount').text(); var master = $('#mastercount').text(); var unionpay = $('#unionpaycount').text(); + var paymal = $('#paymalcount').text(); var amount_due = $('#amount_due').text(); - var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) + var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) + parseFloat(paymal) var result = parseFloat(amount_due) - parseFloat(total); <% if precision.to_i > 0 %> $('#balance').text(parseFloat(result).toFixed(<%= precision %>)); diff --git a/app/views/origami/redeem_payments/index.html.erb b/app/views/origami/redeem_payments/index.html.erb index 1d29e563..286a872c 100755 --- a/app/views/origami/redeem_payments/index.html.erb +++ b/app/views/origami/redeem_payments/index.html.erb @@ -177,7 +177,6 @@ data: {redeem_amount:redeem_amount,membership_id:membership_id,sale_id:sale_id}, success: function(result){ if(result.status == true){ - console.log(result) swal({ title: "Information!", text: result.message, diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 1edb07cf..5a0dbb67 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -665,11 +665,10 @@ $("#first_bill").on('click', function(){ $(".choose_payment").on('click', function () { $( "#loading_wrapper").show(); - var sale_id = $('#sale_id').val(); type = $('.payment_method').val(); if(parseInt(jQuery.inArray("Credit", type)) == -1){ - if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) { + if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1 || parseInt(jQuery.inArray("PAYMAL", type)) != -1) { calculate_member_discount(sale_id,"Card"); }else{ diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index 8f310dab..02e35bb8 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -20,11 +20,11 @@ class ActionController::Base end else # check for license file - if check_license - current_license(ENV["SX_PROVISION_URL"]) - else - redirect_to activate_path - end + # if check_license + # current_license(ENV["SX_PROVISION_URL"]) + # else + # redirect_to activate_path + # end end end diff --git a/config/routes.rb b/config/routes.rb index 092b82d6..f4865c48 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -180,6 +180,7 @@ scope "(:locale)", locale: /en|mm/ do post 'payment/paypar' => 'paypar_payments#create' post 'payment/credit' => 'credit_payments#create' post 'payment/voucher' => 'voucher_payments#create' + post 'payment/paymal' => 'paymal#create' get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index" @@ -187,6 +188,7 @@ scope "(:locale)", locale: /en|mm/ do get 'sale/:sale_id/:type/payment/others_payment/VISA' => "visa#index" get 'sale/:sale_id/:type/payment/others_payment/Master' => "master#index" get 'sale/:sale_id/:type/payment/others_payment/JCB' => "jcb#index" + get 'sale/:sale_id/:type/payment/others_payment/PAYMAL' => "paymal#index" get 'sale/:sale_id/:type/payment/others_payment/UNIONPAY' => "unionpay#index" get 'sale/:sale_id/:type/payment/others_payment/Redeem' => "redeem_payments#index" get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index" diff --git a/spec/controllers/origami/paymal_controller_spec.rb b/spec/controllers/origami/paymal_controller_spec.rb new file mode 100644 index 00000000..8dffaf69 --- /dev/null +++ b/spec/controllers/origami/paymal_controller_spec.rb @@ -0,0 +1,12 @@ +require 'rails_helper' + +RSpec.describe Origami::PaymalController, type: :controller do + + describe "GET #index" do + it "returns http success" do + get :index + expect(response).to have_http_status(:success) + end + end + +end diff --git a/spec/helpers/origami/paymal_helper_spec.rb b/spec/helpers/origami/paymal_helper_spec.rb new file mode 100644 index 00000000..7d27aafa --- /dev/null +++ b/spec/helpers/origami/paymal_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Origami::PaymalHelper. For example: +# +# describe Origami::PaymalHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Origami::PaymalHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/views/origami/paymal/index.html.erb_spec.rb b/spec/views/origami/paymal/index.html.erb_spec.rb new file mode 100644 index 00000000..c047162a --- /dev/null +++ b/spec/views/origami/paymal/index.html.erb_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe "paymal/index.html.erb", type: :view do + pending "add some examples to (or delete) #{__FILE__}" +end From 186353acb0410ee59034120a4dae68c11aba5103 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Mon, 26 Mar 2018 11:40:04 +0630 Subject: [PATCH 07/30] Multiple image upload finished --- app/controllers/settings/shops_controller.rb | 10 ++++------ app/models/display_image.rb | 2 +- app/views/settings/shops/_form.html.erb | 17 +++-------------- app/views/settings/shops/show.html.erb | 2 +- 4 files changed, 9 insertions(+), 22 deletions(-) diff --git a/app/controllers/settings/shops_controller.rb b/app/controllers/settings/shops_controller.rb index 97c6422d..975d9e25 100644 --- a/app/controllers/settings/shops_controller.rb +++ b/app/controllers/settings/shops_controller.rb @@ -47,15 +47,13 @@ class Settings::ShopsController < ApplicationController # PATCH/PUT /settings/shops/1 # PATCH/PUT /settings/shops/1.json def update + respond_to do |format| if @settings_shop.update(shop_params) if params[:display_images].present? - params[:display_images]['image'].each do |a| - - aa = a.read - base64_encoded = Base64.encode64(aa) - byebug - @display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :image => base64_encoded) + params[:display_images][:image].each do |a| + @aa = Base64.encode64(a.read) + @display_image = @settings_shop.display_images.create!(:shop_id => @shop.id, :image => "data:image/jpeg;base64,"+@aa) end end format.html { redirect_to settings_shops_url, notice: 'Shop was successfully updated.' } diff --git a/app/models/display_image.rb b/app/models/display_image.rb index 63405b26..7f6624e2 100644 --- a/app/models/display_image.rb +++ b/app/models/display_image.rb @@ -1,5 +1,5 @@ class DisplayImage < ApplicationRecord - mount_uploader :image, DisplayImageUploader + #mount_uploader :image, DisplayImageUploader belongs_to :shop end diff --git a/app/views/settings/shops/_form.html.erb b/app/views/settings/shops/_form.html.erb index 38555333..7a3c0a04 100755 --- a/app/views/settings/shops/_form.html.erb +++ b/app/views/settings/shops/_form.html.erb @@ -44,25 +44,14 @@
- <%= f.fields_for :display_images do |p| %> -
- <%= image_tag p.object.image, :class => "img-thumbnail" %> - - <%= link_to "Destroy", settings_shop_display_image_path(p.object), method: :delete %> -
- <% end %> - + <%= image_tag "#{p.object.image}", :class => "img-thumbnail" %> + <%= link_to "Destroy", settings_shop_display_image_path(p.object), method: :delete %> + <% end %>
<%= f.file_field :image, :multiple => true, name: "display_images[image][]" %> -
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> diff --git a/app/views/settings/shops/show.html.erb b/app/views/settings/shops/show.html.erb index d30ca274..7d04d504 100755 --- a/app/views/settings/shops/show.html.erb +++ b/app/views/settings/shops/show.html.erb @@ -103,7 +103,7 @@
From c602988f42f30d1ead81e1e2ecf6f92d01a3d1de Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Mon, 26 Mar 2018 18:05:09 +0630 Subject: [PATCH 08/30] Add Room and Table Moving --- README.md | 12 ++++ .../origami/movetable_controller.rb | 11 ++++ app/models/printer/receipt_printer.rb | 10 ++++ app/pdf/move_table_pdf.rb | 58 +++++++++++++++++++ 4 files changed, 91 insertions(+) create mode 100644 app/pdf/move_table_pdf.rb diff --git a/README.md b/README.md index b5d2c62b..0cfa2458 100755 --- a/README.md +++ b/README.md @@ -138,6 +138,18 @@ For CloseCashierCustomisePdf in lookups 1) settings/print_settings 2) settings/lookups => { type:print_settings, name: CloseCashierCustomisePdf, value:1 } +<---- Extra Fields Script -----> +For MoveTablePdf in lookups + *** Both Table and Room Moving *** + 1) settings/lookups => { type:print_settings, name: MoveTablePdf, value:1 } + +For MoveTablePdf in print settings + * Backend > Printer > Print Settings > New + i) Name : Move Table + ii) Unique Code: MoveTablePdf + iii)Template: ... + iv) Font: Zawgyi-One v) Printer: #printer name + * ToDo list 1. Migration diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index dfdfcabf..61af7458 100755 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -69,6 +69,17 @@ class Origami::MovetableController < BaseOrigamiController end @get_type = Booking.update_dining_facility(booking_array,change_to,change_from) + + # get printer info + @from = (DiningFacility.find(change_from)).name + @to = (DiningFacility.find(change_to)).name + @type = (DiningFacility.find(change_to)).type + @date = DateTime.now + @shop = Shop::ShopDetail + unique_code = "MoveTablePdf" + print_settings = PrintSetting.find_by_unique_code(unique_code) + printer = Printer::ReceiptPrinter.new(print_settings) + printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type) end end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index d544c908..a55b737d 100755 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -238,6 +238,16 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker self.print("tmp/print_queue_no.pdf") end + #Move Table Print + def print_move_table(printer_settings,to,from,shop_detail,date,type) + #Use CUPS service + #Generate PDF + #Print + pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type) + pdf.render_file "tmp/print_move_table.pdf" + self.print("tmp/print_move_table.pdf") + end + #Bill Receipt Print def print_crm_order(booking,order_items,setting) #Use CUPS service diff --git a/app/pdf/move_table_pdf.rb b/app/pdf/move_table_pdf.rb new file mode 100644 index 00000000..4d4463bc --- /dev/null +++ b/app/pdf/move_table_pdf.rb @@ -0,0 +1,58 @@ +class MoveTablePdf < Prawn::Document + attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width + def initialize(printer_settings,to,from,shop_detail,date,type) + self.page_width = printer_settings.page_width + self.page_height = printer_settings.page_height + self.margin = 5 + self.price_width = 35 + self.qty_width = 20 + self.total_width = 35 + self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width)) + self.item_height = 15 + self.item_description_width = (self.page_width-20) / 2 + self.label_width = 100 + + super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + + # db font setup + if printer_settings.font != "" + font_families.update("#{printer_settings.font}" => { + :normal => "public/fonts/#{printer_settings.font}.ttf", + :italic => "public/fonts/#{printer_settings.font}.ttf", + :bold => "public/fonts/#{printer_settings.font}.ttf", + :bold_italic => "public/fonts/#{printer_settings.font}.ttf" + }) + + font "#{printer_settings.font}" + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] + end + + self.header_font_size = 10 + self.item_font_size = 8 + + header(printer_settings.name,type) + + call_move_table(to,from,date,type) + + move_down 5 + stroke_horizontal_rule + move_down 5 + + end + + def header (name,type) + text "Move #{type}", :left_margin => -10, :size => self.header_font_size,:align => :center + # move_down self.item_height + move_down 5 + stroke_horizontal_rule + move_down 5 + end + + def call_move_table (to,from,date,type) + move_down 3 + text "Date Time : #{date.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :left_margin => -10, :size => self.header_font_size + text "Change [#{from}] To [#{to}]", :left_margin => -10, :size => self.header_font_size + end + + +end \ No newline at end of file From ff19f20a188532811c9ba82e2a350cba1c4de5da Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Wed, 28 Mar 2018 14:52:57 +0630 Subject: [PATCH 09/30] Edit UI design for shop images --- app/assets/stylesheets/application.scss | 5 +++++ app/views/settings/shops/_form.html.erb | 26 ++++++++++++++----------- app/views/settings/shops/show.html.erb | 4 ++-- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 2249d049..15e8a986 100755 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -98,4 +98,9 @@ nav.pagination .page a:hover, i.logout_icon{ position: relative; top: 5px; +} + +/* Second display image */ +.second-display{ + margin : 12px; } \ No newline at end of file diff --git a/app/views/settings/shops/_form.html.erb b/app/views/settings/shops/_form.html.erb index 7a3c0a04..57665164 100755 --- a/app/views/settings/shops/_form.html.erb +++ b/app/views/settings/shops/_form.html.erb @@ -40,18 +40,22 @@ - -
-
-
- <%= f.fields_for :display_images do |p| %> - <%= image_tag "#{p.object.image}", :class => "img-thumbnail" %> - <%= link_to "Destroy", settings_shop_display_image_path(p.object), method: :delete %> - <% end %> +
+
+ +
+
+
+ <%= f.fields_for :display_images do |p| %> + <%= image_tag "#{p.object.image}", :class => "img-thumbnail second-display", :size => "150x185"%> + <%= link_to 'delete'.html_safe, settings_shop_display_image_path(p.object), method: :delete %> + <% end %> +
-
-
- <%= f.file_field :image, :multiple => true, name: "display_images[image][]" %> +
+
+ <%= f.file_field :image, :multiple => true, name: "display_images[image][]" %> +
<%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> diff --git a/app/views/settings/shops/show.html.erb b/app/views/settings/shops/show.html.erb index 7d04d504..40082d72 100755 --- a/app/views/settings/shops/show.html.erb +++ b/app/views/settings/shops/show.html.erb @@ -97,13 +97,13 @@
- + From bc922a68c813fa7ff6154a1f4b4fe362daf0899d Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Wed, 28 Mar 2018 16:17:41 +0630 Subject: [PATCH 10/30] Add Moved By in MoveTablePdf --- app/controllers/origami/movetable_controller.rb | 7 ++++--- app/models/printer/receipt_printer.rb | 4 ++-- app/pdf/move_table_pdf.rb | 9 +++++---- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index 61af7458..09d9669e 100755 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -71,15 +71,16 @@ class Origami::MovetableController < BaseOrigamiController @get_type = Booking.update_dining_facility(booking_array,change_to,change_from) # get printer info - @from = (DiningFacility.find(change_from)).name - @to = (DiningFacility.find(change_to)).name + @from = (DiningFacility.find(change_from)).name + @to = (DiningFacility.find(change_to)).name @type = (DiningFacility.find(change_to)).type + @moved_by = @current_user.name @date = DateTime.now @shop = Shop::ShopDetail unique_code = "MoveTablePdf" print_settings = PrintSetting.find_by_unique_code(unique_code) printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type) + printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by) end end diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index a55b737d..abc4c49c 100755 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -239,11 +239,11 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end #Move Table Print - def print_move_table(printer_settings,to,from,shop_detail,date,type) + def print_move_table(printer_settings,to,from,shop_detail,date,type,moved_by) #Use CUPS service #Generate PDF #Print - pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type) + pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type,moved_by) pdf.render_file "tmp/print_move_table.pdf" self.print("tmp/print_move_table.pdf") end diff --git a/app/pdf/move_table_pdf.rb b/app/pdf/move_table_pdf.rb index 4d4463bc..7b4ad8e4 100644 --- a/app/pdf/move_table_pdf.rb +++ b/app/pdf/move_table_pdf.rb @@ -1,6 +1,6 @@ class MoveTablePdf < Prawn::Document attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width - def initialize(printer_settings,to,from,shop_detail,date,type) + def initialize(printer_settings,to,from,shop_detail,date,type,moved_by) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height self.margin = 5 @@ -32,7 +32,7 @@ class MoveTablePdf < Prawn::Document header(printer_settings.name,type) - call_move_table(to,from,date,type) + call_move_table(to,from,date,type,moved_by) move_down 5 stroke_horizontal_rule @@ -41,17 +41,18 @@ class MoveTablePdf < Prawn::Document end def header (name,type) - text "Move #{type}", :left_margin => -10, :size => self.header_font_size,:align => :center + text "Move #{type}", :left_margin => -10, :size => self.header_font_size.to_i + 3,:align => :center # move_down self.item_height move_down 5 stroke_horizontal_rule move_down 5 end - def call_move_table (to,from,date,type) + def call_move_table (to,from,date,type,moved_by) move_down 3 text "Date Time : #{date.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :left_margin => -10, :size => self.header_font_size text "Change [#{from}] To [#{to}]", :left_margin => -10, :size => self.header_font_size + text "Moved By : #{moved_by}", :left_margin => -10, :size => self.header_font_size end From 2bf08827e7590cfe0505d19651372d1500cef492 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Thu, 29 Mar 2018 10:03:21 +0630 Subject: [PATCH 11/30] Second Display Image finished --- .../origami/second_display_controller.rb | 5 +- app/models/display_image.rb | 2 - app/uploaders/display_image_uploader.rb | 59 ------------------- .../second_display/_second_display.html.erb | 9 ++- .../origami/second_display/_slider.html.erb | 22 +++---- 5 files changed, 24 insertions(+), 73 deletions(-) delete mode 100644 app/uploaders/display_image_uploader.rb diff --git a/app/controllers/origami/second_display_controller.rb b/app/controllers/origami/second_display_controller.rb index 8d2efd6f..a2bf34fd 100644 --- a/app/controllers/origami/second_display_controller.rb +++ b/app/controllers/origami/second_display_controller.rb @@ -1,7 +1,10 @@ class Origami::SecondDisplayController < BaseOrigamiController def index - + @display_images = DisplayImage.all + end + + def show end def customer_view diff --git a/app/models/display_image.rb b/app/models/display_image.rb index 7f6624e2..30d83566 100644 --- a/app/models/display_image.rb +++ b/app/models/display_image.rb @@ -1,5 +1,3 @@ class DisplayImage < ApplicationRecord - #mount_uploader :image, DisplayImageUploader belongs_to :shop - end diff --git a/app/uploaders/display_image_uploader.rb b/app/uploaders/display_image_uploader.rb deleted file mode 100644 index 33e28997..00000000 --- a/app/uploaders/display_image_uploader.rb +++ /dev/null @@ -1,59 +0,0 @@ -class DisplayImageUploader < CarrierWave::Uploader::Base - - # Include RMagick or MiniMagick support: - # include CarrierWave::RMagick - include CarrierWave::MiniMagick - - # Choose what kind of storage to use for this uploader: - storage :file - # storage :fog - - # def root - # Rails.root.join 'public/' - # end - - # Override the directory where uploaded files will be stored. - # This is a sensible default for uploaders that are meant to be mounted: - def store_dir - #"image/image" - "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" - end - - # def cache_dir - # '/tmp/images' - # end - - # Provide a default URL as a default if there hasn't been a file uploaded: - # def default_url(*args) - # # For Rails 3.1+ asset pipeline compatibility: - # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) - # - # "/images/fallback/" + [version_name, "default.png"].compact.join('_') - # end - - # Process files as they are uploaded: - # process scale: [200, 300] - process :resize_to_fit => [200, 150] - # - # def scale(width, height) - # # do something - # end - - # Create different versions of your uploaded files: - # version :thumb do - # process resize_to_fit: [50, 50] - # end - - # Add a white list of extensions which are allowed to be uploaded. - # For images you might use something like this: - def extension_whitelist - %w(jpg jpeg gif png) - end - - # Override the filename of the uploaded files: - # Avoid using model.id or version_name here, see uploader/store.rb for details. - # def filename - # "something.jpg" if original_filename - # end - -end \ No newline at end of file diff --git a/app/views/origami/second_display/_second_display.html.erb b/app/views/origami/second_display/_second_display.html.erb index 267be25a..c09d6c4c 100644 --- a/app/views/origami/second_display/_second_display.html.erb +++ b/app/views/origami/second_display/_second_display.html.erb @@ -54,7 +54,14 @@
- <%= image_tag("slider/s2.jpg", :alt => "rss feed") %> +
+
+ <% @display_images.each do |p| %> + <%= image_tag "#{p.image}", :alt => "rss feed"%> + <% break %> + <% end %> +
+
diff --git a/app/views/origami/second_display/_slider.html.erb b/app/views/origami/second_display/_slider.html.erb index 61c71203..71f463b7 100644 --- a/app/views/origami/second_display/_slider.html.erb +++ b/app/views/origami/second_display/_slider.html.erb @@ -2,17 +2,19 @@ <%= javascript_include_tag 'wowslider', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'wow_script', 'data-turbolinks-track': 'reload' %>
-
-
-
-
    -
  • <%= image_tag("slider/s1.jpg", :alt => "rss feed") %>
    • -
  • <%= image_tag("slider/s2.jpg", :alt => "rss feed") %>
    • -
  • <%= image_tag("slider/s4.jpg", :alt => "rss feed") %>
    • -
-
-
+
+
+
+
    + <% @display_images.each do |p| %> +
  • + <%= image_tag "#{p.image}", :alt => "rss feed"%> +
    • + <% end %> +
+
+
From 850c134ed2c9dfd7f77fe59747c5b53408269d69 Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 29 Mar 2018 11:17:35 +0630 Subject: [PATCH 12/30] check product sale --- app/models/ability.rb | 5 +++++ app/models/sale.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/models/ability.rb b/app/models/ability.rb index 0b1edcc3..b1930e1b 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -179,6 +179,11 @@ class Ability can :remove_all_discount, :discount can :member_discount, :discount + can :move_dining, :movetable + can :moving, :movetable + + can :move_dining, :moveroom + can :manage, Customer can :manage, DiningQueue diff --git a/app/models/sale.rb b/app/models/sale.rb index 970896bf..ebb32ec3 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -950,7 +950,7 @@ def self.get_menu_item_query(order_by) " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" + " LEFT JOIN sales s ON s.sale_id = si.sale_id") .where("(CASE WHEN s.sale_status IS NOT NULL THEN s.sale_status='completed' ELSE 1 END)") - .group("mc.id, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE mii.item_instance_name END)") + .group("mc.id, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE CONCAT(menu_items.name,' - ',mii.item_instance_name) END)") .order("si.qty #{order_by}, menu_items.menu_category_id #{order_by}") end #product sale report query From c54441c391570419522cf5bd590a3e37b68082b7 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Thu, 29 Mar 2018 15:07:46 +0630 Subject: [PATCH 13/30] Add UI view for Promotion Code --- app/views/origami/discounts/index.html.erb | 47 ++++++++++++++++------ 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index af96f813..3c1f402e 100755 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -116,25 +116,23 @@
-
+

- <% - @accounts.each do |acc| - %> + <% @accounts.each do |acc| %> - <% end %> -
-
-
+ <% end %> +
+
+
-
-
-
+
+
+
@@ -208,12 +206,35 @@
-
-
+
+
+
+
Promo Code
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
From 15f0abac21857e053db239666ff60ef2e50f4052 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 29 Mar 2018 16:18:48 +0630 Subject: [PATCH 14/30] update tax migrate --- db/migrate/20170403183755_create_tax_profiles.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20170403183755_create_tax_profiles.rb b/db/migrate/20170403183755_create_tax_profiles.rb index f5210bbb..2c96fd0d 100755 --- a/db/migrate/20170403183755_create_tax_profiles.rb +++ b/db/migrate/20170403183755_create_tax_profiles.rb @@ -2,7 +2,7 @@ class CreateTaxProfiles < ActiveRecord::Migration[5.1] def change create_table :tax_profiles do |t| t.string :name, :null => false - t.string :group_type, :null => false + t.string :group_type t.decimal :rate, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.boolean :inclusive, :null => false, :default => false t.integer :order_by, :null => false, :default => 1 From 75f3377d75648b290975f908b176700a86fe2647 Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 29 Mar 2018 19:39:29 +0630 Subject: [PATCH 15/30] change product sale report --- app/views/reports/product_sale/index.html.erb | 38 +++++++++++++------ app/views/reports/product_sale/index.xls.erb | 30 +++++++++++---- 2 files changed, 50 insertions(+), 18 deletions(-) mode change 100755 => 100644 app/views/reports/product_sale/index.html.erb mode change 100755 => 100644 app/views/reports/product_sale/index.xls.erb diff --git a/app/views/reports/product_sale/index.html.erb b/app/views/reports/product_sale/index.html.erb old mode 100755 new mode 100644 index f614fbb9..4670f6b3 --- a/app/views/reports/product_sale/index.html.erb +++ b/app/views/reports/product_sale/index.html.erb @@ -45,41 +45,58 @@
- + <% unless @sale_data.blank? %> <% acc_arr = Array.new %> - <% cate_arr = Array.new %> - + <% cate_arr = Array.new %> <% grand_total = 0 %> <% total_qty = 0 %> + <% total_item = {} %> + <% total_data = {} %> + <% @sale_data.each do |sale| + if !total_item.has_key?(sale.item_code) + total_item[sale.item_code] = sale.total_item + total_data[sale.item_code] = sale.grand_total + else + if sale.status_type == "void" + total_item[sale.item_code] += sale.total_item + end + if sale.status_type == "void" || sale.status_type == "Discount" || sale.status_type == "foc" + total_data[sale.item_code] += sale.grand_total + end + end + end %> <% @sale_data.each do |sale| %> <% grand_total += sale.grand_total %> <% if sale.status_type != "Discount" && sale.status_type != "foc" - total_qty += sale.total_item + total_qty += sale.total_item end %> <% if sale.status_type == "foc" && sale.price > 0 total_qty += sale.total_item end %> - <% if !sale.status_type %> + + <% if sale.status_type != "Discount" && sale.price.to_f >= 0 %> <% if !cate_arr.include?(sale.menu_category_id) %> - <% cate_arr.push(sale.menu_category_id) %> + <% cate_arr.push(sale.menu_category_id) %> <% else %> - <% cate_arr = Array.new %> + <% if sale.total_item > 0 %> + <% cate_arr = Array.new %> + <% end %> <% end %> - - - + + + @@ -89,7 +106,6 @@ - diff --git a/app/views/reports/product_sale/index.xls.erb b/app/views/reports/product_sale/index.xls.erb old mode 100755 new mode 100644 index eb7f50f8..0ff60964 --- a/app/views/reports/product_sale/index.xls.erb +++ b/app/views/reports/product_sale/index.xls.erb @@ -11,7 +11,7 @@ - + @@ -21,6 +21,21 @@ <% cate_arr = Array.new %> <% grand_total = 0 %> <% total_qty = 0 %> + <% total_item = {} %> + <% total_data = {} %> + <% @sale_data.each do |sale| + if !total_item.has_key?(sale.item_code) + total_item[sale.item_code] = sale.total_item + total_data[sale.item_code] = sale.grand_total + else + if sale.status_type == "void" + total_item[sale.item_code] += sale.total_item + end + if sale.status_type == "void" || sale.status_type == "Discount" || sale.status_type == "foc" + total_data[sale.item_code] += sale.grand_total + end + end + end %> <% @sale_data.each do |sale| %> <% grand_total += sale.grand_total %> @@ -31,21 +46,23 @@ total_qty += sale.total_item end %> - <% if !sale.status_type %> + <% if sale.status_type != "Discount" && sale.price.to_f >= 0 %> <% if !cate_arr.include?(sale.menu_category_id) %> <% cate_arr.push(sale.menu_category_id) %> <% else %> - <% cate_arr = Array.new %> + <% if sale.total_item > 0 %> + <% cate_arr = Array.new %> + <% end %> <% end %> - - - + + + @@ -55,7 +72,6 @@ - <% end %> From 5588f40753ec81eec5415c5fa0c524885532c971 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 30 Mar 2018 14:20:47 +0630 Subject: [PATCH 16/30] update waste and spoilage --- app/controllers/origami/home_controller.rb | 2 +- .../origami/payments_controller.rb | 2 - app/controllers/origami/rooms_controller.rb | 3 +- app/controllers/origami/void_controller.rb | 2 +- ...troller .rb => waste_spoile_controller.rb} | 28 +++-- .../reports/waste_and_spoilage_controller.rb | 19 ++++ app/models/sale.rb | 10 ++ app/models/sale_payment.rb | 2 +- app/views/layouts/_left_sidebar.html.erb | 3 + app/views/origami/customers/index.html.erb | 2 +- app/views/origami/home/show.html.erb | 12 +- app/views/origami/rooms/show.html.erb | 65 ++++++++++- .../_shift_sale_report_filter.html.erb | 73 ++++++++++++ .../reports/waste_and_spoilage/index.html.erb | 83 ++++++++++++++ .../reports/waste_and_spoilage/index.xls.erb | 106 ++++++++++++++++++ config/routes.rb | 7 +- 16 files changed, 380 insertions(+), 39 deletions(-) rename app/controllers/origami/{waste_spoile_controller .rb => waste_spoile_controller.rb} (83%) create mode 100755 app/controllers/reports/waste_and_spoilage_controller.rb create mode 100755 app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb create mode 100755 app/views/reports/waste_and_spoilage/index.html.erb create mode 100755 app/views/reports/waste_and_spoilage/index.xls.erb diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index a8e2818c..759cb1b6 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -95,7 +95,7 @@ class Origami::HomeController < BaseOrigamiController @status_order = 'order' else sale = Sale.find(booking.sale_id) - if sale.sale_status != "completed" && sale.sale_status != 'void' + if sale.sale_status != "completed" && sale.sale_status != 'void' && sale.sale_status != 'spoile' && sale.sale_status != 'waste' @sale_array.push(sale) if @status_order == 'order' @status_order = 'sale' diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 5397c7f0..16a79d33 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -113,8 +113,6 @@ class Origami::PaymentsController < BaseOrigamiController end end #end rounding adjustment - puts "sale" - puts saleObj.to_json sale_payment = SalePayment.new sale_payment.process_payment(saleObj, current_user.name, cash, "cash") diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index 11a7f93d..5c0cd454 100755 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -79,8 +79,7 @@ class Origami::RoomsController < BaseOrigamiController @status_order = 'order' else sale = Sale.find(booking.sale_id) - if sale.sale_status != "completed" && sale.sale_status != 'void' - puts "enter" + if sale.sale_status != "completed" && sale.sale_status != 'void' && sale.sale_status != 'spoile' && sale.sale_status != 'waste' @sale_array.push(sale) if @status_order == 'order' @status_order = 'sale' diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index 74e495ca..83dce707 100755 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -48,7 +48,7 @@ class Origami::VoidController < BaseOrigamiController table.bookings.each do |booking| if booking.booking_status != 'moved' if booking.sale_id - if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' + if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' && booking.sale.sale_status != 'spoile' && booking.sale.sale_status != 'waste' table_avaliable = false table_count += 1 else diff --git a/app/controllers/origami/waste_spoile_controller .rb b/app/controllers/origami/waste_spoile_controller.rb similarity index 83% rename from app/controllers/origami/waste_spoile_controller .rb rename to app/controllers/origami/waste_spoile_controller.rb index 72180786..c94b33bb 100755 --- a/app/controllers/origami/waste_spoile_controller .rb +++ b/app/controllers/origami/waste_spoile_controller.rb @@ -1,29 +1,28 @@ class Origami::WasteSpoileController < BaseOrigamiController - def index - - end - def waste_and_spoile + def waste_and_spoilage sale_id = params[:sale_id] remark = params[:remark] order_source = params[:type] #tax profile source if Sale.exists?(sale_id) sale = Sale.find_by_sale_id(sale_id) - - if sale.discount_type == "member_discount" - sale.update_attributes(total_discount: 0) - sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source) + SaleTax.where("sale_id='#{sale_id}'").find_each do |existing_tax| + existing_tax.delete end - + sale.update_attributes(total_discount: 0,total_tax: 0,grand_total: sale.total_amount,rounding_adjustment:0) sale.payment_status = remark sale.sale_status = remark sale.save + # sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source) # add to sale item with foc - sale_items = SaleItem.where("sale_id='#{ sale_id }' and status is null") + # sale_items = SaleItem.where("sale_id='#{ sale_id }' and status is null") - sale_items.each do|item| - SaleItem.update_existing_item(item.qty, item, sale_id, remark, item.unit_price, item.price) + sale.sale_items.each do|item| + # SaleItem.update_existing_item(item.qty, item, sale_id, remark, item.unit_price, item.price) + item.status = remark + item.remark = remark + item.save end if sale.bookings[0].dining_facility_id.to_i > 0 @@ -33,7 +32,7 @@ class Origami::WasteSpoileController < BaseOrigamiController table.bookings.each do |booking| if booking.booking_status != 'moved' if booking.sale_id - if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' + if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' && booking.sale.sale_status != 'spoile' && booking.sale.sale_status != 'waste' table_avaliable = false table_count += 1 else @@ -45,7 +44,6 @@ class Origami::WasteSpoileController < BaseOrigamiController end end end - if table_avaliable && table_count == 0 table.status = 'available' table.save @@ -104,7 +102,7 @@ class Origami::WasteSpoileController < BaseOrigamiController discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil) + filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, remark,current_balance,nil) result = { :filepath => filename, :printer_model => print_settings.brand_name, diff --git a/app/controllers/reports/waste_and_spoilage_controller.rb b/app/controllers/reports/waste_and_spoilage_controller.rb new file mode 100755 index 00000000..369c6860 --- /dev/null +++ b/app/controllers/reports/waste_and_spoilage_controller.rb @@ -0,0 +1,19 @@ +class Reports::WasteAndSpoilageController < BaseReportController +authorize_resource :class => false + def index + from, to = get_date_range_from_params + @sale_type = params[:sale_type] + @sale_data = Sale.get_wastes_and_spoilages(from,to,@sale_type) + @from = from + @to = to + # get printer info + @print_settings = PrintSetting.get_precision_delimiter() + + respond_to do |format| + format.html + format.xls + end + end + + +end \ No newline at end of file diff --git a/app/models/sale.rb b/app/models/sale.rb index 970896bf..e25589dc 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1109,6 +1109,16 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type return all_total,sale_type end +def self.get_wastes_and_spoilages(from,to,status) + if status == "spoile" + type = "and sales.sale_status = 'spoile'" + else + type = "and sales.sale_status = 'waste'" + end + query = Sale.all.where("sales.receipt_date between ? and ? #{type}",from,to) + .group("sales.receipt_no") +end + # def self.get_separate_tax(from,to,payment_method=nil) # query = SaleTax.select("SUM(tax_payable_amount) AS st_amount,tax_name") diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 3ff4697e..5a0b22b2 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -418,7 +418,7 @@ class SalePayment < ApplicationRecord bookings.each do |tablebooking| if tablebooking.booking_status != 'moved' if tablebooking.sale_id - if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' + if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' && tablebooking.sale.sale_status != 'spoile' && tablebooking.sale.sale_status != 'waste' status = false sale_count += 1 else diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index 63067ec0..ea3a7b61 100644 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -144,6 +144,9 @@
  • Void Sales
    • +
  • + Wastes & Spoilages +
  • Payment Method
    • diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 2600f3fe..f36ca636 100755 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -26,7 +26,7 @@ <% end %> --> - <% path ="/origami/#{@sale_id}/customers" %> + <% path ="/origami/#{@sale_id}/#{@cashier_type}/customers/#{@page}" %> <%= form_tag path, :id => "filter_form", :method => :get do %>
    diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 8ffe8964..4810cf13 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -598,8 +598,6 @@
    - -
    @@ -1059,8 +1057,6 @@ if (isConfirm) { var sale_id = "<%= @obj_sale.sale_id rescue "" %>" var url = "/origami/sale/" + sale_id + '/cashier/waste_and_spoilage'; - -console.log(url) $.ajax({ type: 'POST', url: url, @@ -1068,10 +1064,10 @@ console.log(url) success: function (result) { console.log(result) // For Server Print - from jade - // if ($("#server_mode").val() == "cloud") { - // code2lab.printFile(result.filepath.substr(6), result.printer_url); - // } - // window.location.href = '/origami/'; + if ($("#server_mode").val() == "cloud") { + code2lab.printFile(result.filepath.substr(6), result.printer_url); + } + window.location.href = '/origami/'; } }); } diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 424690ff..e2f04018 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -450,10 +450,11 @@ <% if current_login_employee.role != "waiter" %> - - - + +
    + +
    +
    + +
    + + +
    +
    + + + + diff --git a/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb b/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb new file mode 100755 index 00000000..3d89a376 --- /dev/null +++ b/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb @@ -0,0 +1,73 @@ +
    + <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> + <% if period_type != false %> +
    +
    + + +
    +
    + + +
    + +
    + + + +
    +
    + + +
    + +
    +
    + +
    +
    + <% end %> + + <% end %> +
    + + diff --git a/app/views/reports/waste_and_spoilage/index.html.erb b/app/views/reports/waste_and_spoilage/index.html.erb new file mode 100755 index 00000000..9b279c83 --- /dev/null +++ b/app/views/reports/waste_and_spoilage/index.html.erb @@ -0,0 +1,83 @@ +
    +
      +
    1. <%= t("views.right_panel.button.home") %>
      2. +
    2. <%= t("views.right_panel.detail.waste_spoilage_report") %>
      3. + + <%= link_to 'Back', dashboard_path %> + +
    +
    +
    +
    + + + <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_waste_and_spoilage_index_path} %> +
    + + + + +
    + <%= t("views.btn.exp_to_excel") %> +
    + + + +
    +
    + +
    Shop Images <% @display_images.each do |p| %> - <%= image_tag p.image , :size => '200x200'%>
    + <%= image_tag "#{p.image}" %> <% end %>
    Shop Image<%= image_tag @settings_shop.logo, :size => '200x200'%><%= image_tag @settings_shop.logo, :class => "img-thumbnail second-display", :size => "155x185"%>
    Shop Images <% @display_images.each do |p| %> - <%= image_tag "#{p.image}" %> + <%= image_tag "#{p.image}", :class => "img-thumbnail second-display", :size => "155x185"%> <% end %>
    <%= t("views.right_panel.detail.code") %> <%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %><%= t("views.right_panel.detail.unit_price") %> <%= t("views.right_panel.detail.total") %>
     <%= sale.menu_category_name %> <%= sale.item_code rescue '-' %> <%= sale.product_name rescue '-' %><%= sale.total_item rescue '-' %><%= number_with_precision(sale.unit_price , precision:precision.to_i,delimiter:delimiter) rescue '-'%><%= number_with_precision(sale.grand_total , precision:precision.to_i,delimiter:delimiter) rescue '-' %><%= total_item[sale.item_code] rescue '-' %><%= number_with_precision(total_data[sale.item_code] , precision:precision.to_i,delimiter:delimiter) rescue '-' %>
    Total <%= total_qty %> <%= number_with_precision(grand_total , precision:precision.to_i,delimiter:delimiter) rescue '-' %>
    <%= t("views.right_panel.detail.code") %> <%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %><%= t("views.right_panel.detail.unit_price") %> <%= t("views.right_panel.detail.total") %>
     <%= sale.menu_category_name %> <%= sale.item_code rescue '-' %> <%= sale.product_name rescue '-' %><%= sale.total_item rescue ' ' %><%= sale.unit_price rescue ' ' %><%= sale.grand_total rescue ' ' %><%= total_item[sale.item_code] rescue ' ' %><%= total_data[sale.item_code] rescue ' ' %>
    Total <%= total_qty rescue ' ' %> <%= grand_total rescue ' ' %>
    +
    Report For <%= @sale_type? @sale_type : 'Waste' %>
    + <% @sale_data.each do |sale| %> + <% waste_and_spoil_item_count = 0%> + + + + + + + + + + + + + + + + + <% sale.sale_items.each do |item| %> + <% if !item.item_instance_code.nil?%> + <% waste_and_spoil_item_count += item.qty.to_i%> + + + + + + + + <% end %> + <% end %> + + + + + + + + + <% end %> +
    + Receipt No :<%= sale.receipt_no %> + Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %>
    ProductCodeQtyPriceTotal Price
    <%= item.product_name %><%= item.product_code %><%= item.qty %><%= item.price %><%= item.price %>
    Total Qty: + <%= waste_and_spoil_item_count %> + Grand Total: + + <%= sale.grand_total %> + +
    +
    +
    +
    +
    diff --git a/app/views/reports/waste_and_spoilage/index.xls.erb b/app/views/reports/waste_and_spoilage/index.xls.erb new file mode 100755 index 00000000..c8521b0d --- /dev/null +++ b/app/views/reports/waste_and_spoilage/index.xls.erb @@ -0,0 +1,106 @@ + +
    +
    +
    +
    + + + + + + <% if @shift_from %> + + <% if @shift_data.employee %> + <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> + <% end %> + + + <% end %> + + + + + + + <% @tax_profiles.each do |tax| %> + + <% end %> + + + + + + + + <% grand_total = 0 %> + <% old_grand_total = 0 %> + <% total_tax = 0 %> + <% guest_count = 0 %> + <% total_sum = 0 %> + <% discount_amt = 0 %> + <% other_amt = 0 %> + <% total_nett = 0 %> + <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> + <%if @sale_data %> + <% @sale_data.each do |result| %> + + <% grand_total = grand_total.to_f + result.grand_total.to_f %> + <% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %> + <% total_tax += result.total_tax.to_f %> + <% total_sum += result.total_amount.to_f %> + <% discount_amt += result.total_discount.to_f %> + <% rounding_adj += result.rounding_adjustment.to_f %> + + + + + + + + <%if result.customer.customer_type == "Takeaway"%> + + <%end%> + <% result.sale_taxes.each do |tax| %> + + <%end%> + + + + + + + <% end %> + + + + + <% @sale_taxes.each do |tax| %> + + <% end %> + + + + + + + + + + <% @tax_profiles.each do |tax| %> + + <% end %> + + + + + <%end%> + +
    <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
    <%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
    <%= t("views.right_panel.detail.receipt_no") %><%= t :cashier %> <%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> <%= tax.name %><%= t("views.right_panel.detail.grand_total") %><%= t("views.right_panel.detail.rnd_adj_sh") %><%= t("views.right_panel.detail.grand_total") %> +
    + <%= t("views.right_panel.detail.rnd_adj_sh") %> +
    <%= result.receipt_no rescue '-' %> <%= result.cashier_name rescue '-' %><%= result.total_amount rescue '-' %><%= result.total_discount rescue '-' %>0.0<%= tax.tax_payable_amount rescue '-' %><%= result.grand_total %><%= result.rounding_adjustment.to_f rescue '-' %><%= result.grand_total_after_rounding() rescue '-'%>
     <%= total_sum rescue '-'%><%= discount_amt rescue '-'%><%= tax.st_amount.round(2) %><%= grand_total.to_f.round(2) rescue '-'%><%= rounding_adj rescue '-'%><%= grand_total.to_f.round + rounding_adj %>
     <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %><%= tax.name %><%= t("views.right_panel.detail.grand_total") %><%= t("views.right_panel.detail.rnd_adj_sh") %><%= t("views.right_panel.detail.grand_total") %> +
    + <%= t("views.right_panel.detail.rnd_adj_sh") %> +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 233d7e04..4448b75f 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -78,15 +78,13 @@ scope "(:locale)", locale: /en|mm/ do post "check_in" => "check_in_process#check_in_process" post "request_time" => "check_in_process#request_time" post "call_waiter" => "call_waiters#index" - #---------Waste and Spoile --------------# - post 'sale/:sale_id/:type/waste_and_spoilage' => 'waste_spoile#waste_and_spoilage' end end #--------- Cashier ------------# - namespace :origami do + namespace :origami do get "dashboard" => "dashboard#index" @@ -195,7 +193,7 @@ scope "(:locale)", locale: /en|mm/ do #---------Void --------------# post 'sale/:sale_id/:type/void' => 'void#overall_void' - + post 'sale/:sale_id/:type/waste_and_spoilage' => "waste_spoile#waste_and_spoilage" #---------Multiple Invoices --------------# get 'table/:table_id/table_invoices' => "table_invoices#index", :as => "table_invoice_index" @@ -404,6 +402,7 @@ scope "(:locale)", locale: /en|mm/ do resources :shiftsale, :only => [:index, :show] resources :credit_payment, :only => [:index, :show] resources :void_sale, :only => [:index, :show] + resources :waste_and_spoilage, :only => [:index, :show] resources :commission, :only => [:index, :show] resources :stock_check, :only => [:index, :show] resources :payment_method From 4faf1083d1a6bc6dc9be3453cd5c30561a49f1f2 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 30 Mar 2018 14:42:58 +0630 Subject: [PATCH 17/30] update waste and spoilage --- .../_shift_sale_report_filter.html.erb | 4 +- .../reports/waste_and_spoilage/index.html.erb | 148 +++++++++--------- .../reports/waste_and_spoilage/index.xls.erb | 126 +++++---------- 3 files changed, 111 insertions(+), 167 deletions(-) diff --git a/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb b/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb index 3d89a376..1c403afc 100755 --- a/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb +++ b/app/views/reports/waste_and_spoilage/_shift_sale_report_filter.html.erb @@ -34,12 +34,12 @@
    -
    +
    -
    +
    diff --git a/app/views/reports/waste_and_spoilage/index.html.erb b/app/views/reports/waste_and_spoilage/index.html.erb index 9b279c83..f74f99e0 100755 --- a/app/views/reports/waste_and_spoilage/index.html.erb +++ b/app/views/reports/waste_and_spoilage/index.html.erb @@ -1,83 +1,75 @@ -
    -
      -
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.waste_spoilage_report") %>
      3. - - <%= link_to 'Back', dashboard_path %> - -
    -
    -
    -
    - - - <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_waste_and_spoilage_index_path} %> -
    - - - - +
    +
    +
      +
    1. <%= t("views.right_panel.button.home") %>
      2. +
    2. <%= t("views.right_panel.detail.waste_spoilage_report") %>
      3. + + <%= link_to 'Back', dashboard_path %> + +
    +
    +
    +
    + <%= render :partial=>'shift_sale_report_filter', + :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_waste_and_spoilage_index_path} %> +
    <%= t("views.btn.exp_to_excel") %> -
    - - - -
    -
    - - -
    Report For <%= @sale_type? @sale_type : 'Waste' %>
    - <% @sale_data.each do |sale| %> - <% waste_and_spoil_item_count = 0%> - - - - - - - - - - - - - - - - - <% sale.sale_items.each do |item| %> - <% if !item.item_instance_code.nil?%> - <% waste_and_spoil_item_count += item.qty.to_i%> - - - - - - - - <% end %> - <% end %> - - - - - - - - - <% end %> -
    - Receipt No :<%= sale.receipt_no %> - Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %>
    ProductCodeQtyPriceTotal Price
    <%= item.product_name %><%= item.product_code %><%= item.qty %><%= item.price %><%= item.price %>
    Total Qty: - <%= waste_and_spoil_item_count %> - Grand Total: - - <%= sale.grand_total %> - -
    +
    +
    +
    + + +
    Report For <%= @sale_type? @sale_type : 'Waste' %>
    + <% @sale_data.each do |sale| %> + <% waste_and_spoil_item_count = 0%> + + + + + + + + + + + + + + + + + <% sale.sale_items.each do |item| %> + <% if !item.item_instance_code.nil?%> + <% waste_and_spoil_item_count += item.qty.to_i%> + + + + + + + + <% end %> + <% end %> + + + + + + + + <% end %> +
    + Receipt No :<%= sale.receipt_no %> + Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %>
    Item NameItem CodeQtyPriceTotal Price
    <%= item.product_name %><%= item.product_code %><%= item.qty %><%= item.price %><%= item.price %>
    Total Qty: + <%= waste_and_spoil_item_count %> + Grand Total: + + <%= sale.grand_total %> + +
    +
    -
    +
    \ No newline at end of file diff --git a/app/views/reports/waste_and_spoilage/index.xls.erb b/app/views/reports/waste_and_spoilage/index.xls.erb index c8521b0d..4b4fa0a3 100755 --- a/app/views/reports/waste_and_spoilage/index.xls.erb +++ b/app/views/reports/waste_and_spoilage/index.xls.erb @@ -1,104 +1,56 @@ -
    + - +
    Report For <%= @sale_type? @sale_type : 'Waste' %>
    + <% @sale_data.each do |sale| %> + <% waste_and_spoil_item_count = 0%> + - - - <% if @shift_from %> - - <% if @shift_data.employee %> - <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> - <% end %> - - - <% end %> - - - - - - - <% @tax_profiles.each do |tax| %> - - <% end %> - - - - + + + - <% grand_total = 0 %> - <% old_grand_total = 0 %> - <% total_tax = 0 %> - <% guest_count = 0 %> - <% total_sum = 0 %> - <% discount_amt = 0 %> - <% other_amt = 0 %> - <% total_nett = 0 %> - <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> - <%if @sale_data %> - <% @sale_data.each do |result| %> - - <% grand_total = grand_total.to_f + result.grand_total.to_f %> - <% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %> - <% total_tax += result.total_tax.to_f %> - <% total_sum += result.total_amount.to_f %> - <% discount_amt += result.total_discount.to_f %> - <% rounding_adj += result.rounding_adjustment.to_f %> - - - - - - - <%if result.customer.customer_type == "Takeaway"%> - - <%end%> - <% result.sale_taxes.each do |tax| %> - - <%end%> - - - - + + + + + - + + <% sale.sale_items.each do |item| %> + <% if !item.item_instance_code.nil?%> + <% waste_and_spoil_item_count += item.qty.to_i%> + + + + + + + + <% end %> <% end %> - - - - - <% @sale_taxes.each do |tax| %> - - <% end %> - - - - - - - - - <% @tax_profiles.each do |tax| %> - - <% end %> - - - + + + - - <%end%> - + + + <% end %>
    <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
    <%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
    <%= t("views.right_panel.detail.receipt_no") %><%= t :cashier %> <%= t("views.right_panel.detail.name") %><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> <%= tax.name %><%= t("views.right_panel.detail.grand_total") %><%= t("views.right_panel.detail.rnd_adj_sh") %><%= t("views.right_panel.detail.grand_total") %> +
    - <%= t("views.right_panel.detail.rnd_adj_sh") %> -     		+ Receipt No :<%= sale.receipt_no %> + Date : <%= sale.created_at.utc.getlocal.strftime("%e,%b %Y %I:%M %p") %>
    <%= result.receipt_no rescue '-' %> <%= result.cashier_name rescue '-' %><%= result.total_amount rescue '-' %><%= result.total_discount rescue '-' %>0.0<%= tax.tax_payable_amount rescue '-' %><%= result.grand_total %><%= result.rounding_adjustment.to_f rescue '-' %><%= result.grand_total_after_rounding() rescue '-'%>Item NameItem CodeQtyPriceTotal Price
    <%= item.product_name %><%= item.product_code %><%= item.qty %><%= item.price %><%= item.price %>
     <%= total_sum rescue '-'%><%= discount_amt rescue '-'%><%= tax.st_amount.round(2) %><%= grand_total.to_f.round(2) rescue '-'%><%= rounding_adj rescue '-'%><%= grand_total.to_f.round + rounding_adj %>
     <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %><%= tax.name %><%= t("views.right_panel.detail.grand_total") %><%= t("views.right_panel.detail.rnd_adj_sh") %><%= t("views.right_panel.detail.grand_total") %> +
    - <%= t("views.right_panel.detail.rnd_adj_sh") %> +     		Total Qty: + <%= waste_and_spoil_item_count %> + Grand Total: + + <%= sale.grand_total %> +
    From 37f3ef7a0d088c2ea2a703e0914c536f98e54e82 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 30 Mar 2018 15:07:48 +0630 Subject: [PATCH 18/30] update customer assign redirect --- app/controllers/origami/quick_service_controller.rb | 2 +- app/views/origami/customers/index.html.erb | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb index 8abcfcc8..d2194bb5 100644 --- a/app/controllers/origami/quick_service_controller.rb +++ b/app/controllers/origami/quick_service_controller.rb @@ -12,7 +12,7 @@ class Origami::QuickServiceController < ApplicationController day = Date.today.wday @menus = Menu.all @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') - @zone = Zone.all + @zone = Zone.all @customer = Customer.all @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index f36ca636..ab67d9fb 100755 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -119,11 +119,13 @@ <%if !@dining_facility.nil?%> - - + + + <%else%> - + + <%end%> <%= f.error_notification %> <%= f.hidden_field :id, :class => "form-control col-md-6 " %> @@ -469,7 +471,7 @@ if(data.status == true) { var id = $("#table_id").val(); - var type = $("#type").val(); + var type = $("#table_type").val(); var booking_id = ""; <% if !@booking_order.nil? %> booking_id = "<%= @booking_order.booking_id %>"; @@ -502,7 +504,7 @@ $('#back').on('click',function(){ var id = $("#table_id").val(); - var type = $("#type").val(); + var type = $("#table_type").val(); var sale_id = $("#sale_id").val(); if (cashier_type == "quick_service") { window.location.href = '/origami/sale/'+sale_id+'/'+cashier_type+'/payment/'; From 6a9fd67bff40d8fd8489f127e0da05d0009efc9a Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 30 Mar 2018 15:24:51 +0630 Subject: [PATCH 19/30] check payment method --- app/assets/javascripts/origami.js | 2 +- app/controllers/api/payments_controller.rb | 11 + app/controllers/origami/alipay_controller.rb | 77 ++++++ app/controllers/origami/jcb_controller.rb | 3 +- app/controllers/origami/master_controller.rb | 3 +- app/controllers/origami/mpu_controller.rb | 3 +- .../origami/payments_controller.rb | 3 + .../origami/unionpay_controller.rb | 3 +- app/controllers/origami/visa_controller.rb | 3 +- app/models/sale_payment.rb | 4 +- app/views/origami/alipay/create.json.jbuilder | 5 + app/views/origami/alipay/index.html.erb | 258 ++++++++++++++++++ app/views/origami/payments/show.html.erb | 119 ++++---- config/locales/en.yml | 3 + config/locales/mm.yml | 3 + config/routes.rb | 4 + .../origami/alipay_controller_spec.rb | 5 + 17 files changed, 456 insertions(+), 53 deletions(-) create mode 100644 app/controllers/origami/alipay_controller.rb create mode 100755 app/views/origami/alipay/create.json.jbuilder create mode 100755 app/views/origami/alipay/index.html.erb create mode 100644 spec/controllers/origami/alipay_controller_spec.rb diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 7388529b..f2219711 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -323,7 +323,7 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun if(jobj.STATUS == "Approved"){ $.ajax({type: "POST", url: "/origami/payment/"+payment_type, - data: "amount="+ bnk_bill_amount + "&sale_id="+ sale_id, + data: "amount="+ bnk_bill_amount + "&sale_id="+ sale_id + "&ref_no=" + jobj.REFNUM, success:function(result){ if(result){ swal({ diff --git a/app/controllers/api/payments_controller.rb b/app/controllers/api/payments_controller.rb index 39219c6b..459589ed 100755 --- a/app/controllers/api/payments_controller.rb +++ b/app/controllers/api/payments_controller.rb @@ -84,6 +84,17 @@ class Api::PaymentsController < ActionController::API sale_payment.payment_reference = params[:payment_reference] #TODO: implement paypar implementation @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name) + when "JunctionPay" + sale_payment.payment_method = "JunctionPay" + sale_payment.received_amount = params[:amount] + sale_payment.customer_id = params[:customer_id] + sale_payment.payment_reference = params[:vochure_no] + @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name) + when "alipay" + sale_payment.payment_method = "alipay" + sale_payment.received_amount = params[:amount] + sale_payment.payment_reference = params[:payment_reference] + @status, @invoice = sale_payment.process_payment(sale_payment, current_login_employee.name) end end end diff --git a/app/controllers/origami/alipay_controller.rb b/app/controllers/origami/alipay_controller.rb new file mode 100644 index 00000000..3f449856 --- /dev/null +++ b/app/controllers/origami/alipay_controller.rb @@ -0,0 +1,77 @@ +class Origami::AlipayController < BaseOrigamiController + def index + @sale_id = params[:sale_id] + @cashier_type = params[:type] + # limit alipay_amount + sale_data = Sale.find_by_sale_id(@sale_id) + total = 0 + @alipaycount = 0 + @shop = Shop::ShopDetail + @rounding_adj = 0 + @can_alipay = 0 + @member_discount = 0 + @sub_total = 0 + @membership_id = nil + @receipt_no = nil + if !sale_data.nil? + total = sale_data.grand_total + + others = 0 + + if @shop.is_rounding_adj + new_total = Sale.get_rounding_adjustment(sale_data.grand_total) + else + new_total = sale_data.grand_total + end + @rounding_adj = new_total-sale_data.grand_total + + sale_data.sale_payments.each do |sale_payment| + if sale_payment.payment_method == "alipay" + @alipaycount = @alipaycount + sale_payment.payment_amount + else + others = others + sale_payment.payment_amount + end + end + @can_alipay = total - @alipaycount - others + + @member_discount = MembershipSetting.find_by_discount(1) + @sub_total = sale_data.total_amount + @membership_id = sale_data.customer.membership_id + #for bank integration + @receipt_no = sale_data.receipt_no + end + + bank_integration = Lookup.collection_of('bank_integration') + @bank_integration = 0 + if !bank_integration[0].nil? + @bank_integration = bank_integration[0][1] + end + end + + def create + cash = params[:amount] + sale_id = params[:sale_id] + ref_no = params[:ref_no] + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + shop_details = Shop::ShopDetail + + # rounding adjustment + # if shop_details.is_rounding_adj + # new_total = Sale.get_rounding_adjustment(saleObj.grand_total) + # rounding_adj = new_total-saleObj.grand_total + # saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj) + # end + + # saleObj = Sale.find(sale_id) + sale_payment = SalePayment.new + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "alipay",ref_no) + end + end + + #Shop Name in Navbor + helper_method :shop_detail + def shop_detail + @shop = Shop.first + end +end diff --git a/app/controllers/origami/jcb_controller.rb b/app/controllers/origami/jcb_controller.rb index 5c06f9fe..315af34a 100644 --- a/app/controllers/origami/jcb_controller.rb +++ b/app/controllers/origami/jcb_controller.rb @@ -52,6 +52,7 @@ class Origami::JcbController < BaseOrigamiController def create cash = params[:amount] sale_id = params[:sale_id] + ref_no = params[:ref_no] if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) shop_details = Shop::ShopDetail @@ -65,7 +66,7 @@ class Origami::JcbController < BaseOrigamiController # saleObj = Sale.find(sale_id) sale_payment = SalePayment.new - @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "jcb") + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "jcb",ref_no) end end diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb index 858d0125..dc3a83d9 100644 --- a/app/controllers/origami/master_controller.rb +++ b/app/controllers/origami/master_controller.rb @@ -50,6 +50,7 @@ class Origami::MasterController < BaseOrigamiController def create cash = params[:amount] sale_id = params[:sale_id] + ref_no = params[:ref_no] if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) shop_details = Shop::ShopDetail @@ -63,7 +64,7 @@ class Origami::MasterController < BaseOrigamiController # saleObj = Sale.find(sale_id) sale_payment = SalePayment.new - @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "master") + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "master",ref_no) end end diff --git a/app/controllers/origami/mpu_controller.rb b/app/controllers/origami/mpu_controller.rb index 1b125bda..7d3ded34 100644 --- a/app/controllers/origami/mpu_controller.rb +++ b/app/controllers/origami/mpu_controller.rb @@ -51,6 +51,7 @@ class Origami::MpuController < BaseOrigamiController def create cash = params[:amount] sale_id = params[:sale_id] + ref_no = params[:ref_no] if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) shop_details = Shop::ShopDetail @@ -64,7 +65,7 @@ class Origami::MpuController < BaseOrigamiController # saleObj = Sale.find(sale_id) sale_payment = SalePayment.new - @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "mpu") + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "alipay",ref_no) end end diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 5397c7f0..c31dd44d 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -226,6 +226,7 @@ class Origami::PaymentsController < BaseOrigamiController @jcbcount= 0.0 @mastercount = 0.0 @unionpaycount = 0.0 + @alipaycount = 0.0 @junctionpaycount = 0.0 @credit = 0.0 @sale_data = Sale.find_by_sale_id(sale_id) @@ -346,6 +347,8 @@ class Origami::PaymentsController < BaseOrigamiController @junctionpaycount += spay.payment_amount elsif spay.payment_method == "creditnote" @credit += spay.payment_amount + elsif spay.payment_method == "alipay" + @alipaycount += spay.payment_amount end end end diff --git a/app/controllers/origami/unionpay_controller.rb b/app/controllers/origami/unionpay_controller.rb index 7213af6d..ec941a20 100644 --- a/app/controllers/origami/unionpay_controller.rb +++ b/app/controllers/origami/unionpay_controller.rb @@ -48,6 +48,7 @@ class Origami::UnionpayController < BaseOrigamiController def create cash = params[:amount] sale_id = params[:sale_id] + ref_no = params[:ref_no] if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) shop_details = Shop::ShopDetail @@ -62,7 +63,7 @@ class Origami::UnionpayController < BaseOrigamiController # saleObj = Sale.find(sale_id) #end rounding adjustment sale_payment = SalePayment.new - @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "unionpay") + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "unionpay",ref_no) end end diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb index 346b66d1..8cc2bbe3 100644 --- a/app/controllers/origami/visa_controller.rb +++ b/app/controllers/origami/visa_controller.rb @@ -48,6 +48,7 @@ class Origami::VisaController < BaseOrigamiController def create cash = params[:amount] sale_id = params[:sale_id] + ref_no = params[:ref_no] if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) shop_details = Shop::ShopDetail @@ -62,7 +63,7 @@ class Origami::VisaController < BaseOrigamiController # saleObj = Sale.find(sale_id) #end rounding adjustment sale_payment = SalePayment.new - @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "visa") + @status, @sale = sale_payment.process_payment(saleObj, @user, cash, "visa",ref_no) end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 3ff4697e..6b08a9fa 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -51,6 +51,8 @@ class SalePayment < ApplicationRecord payment_status = foc_payment when "JunctionPay" payment_status = junction_pay_payment + when "alipay" + payment_status = external_terminal_card_payment(:alipay) else puts "it was something else" end @@ -230,7 +232,7 @@ class SalePayment < ApplicationRecord payment_status = false self.payment_method = method self.payment_amount = self.received_amount - self.payment_reference = self.card_payment_reference + # self.payment_reference = self.card_payment_reference self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f self.payment_status = "paid" payment_method = self.save! diff --git a/app/views/origami/alipay/create.json.jbuilder b/app/views/origami/alipay/create.json.jbuilder new file mode 100755 index 00000000..9767a7d8 --- /dev/null +++ b/app/views/origami/alipay/create.json.jbuilder @@ -0,0 +1,5 @@ +if(@status) + json.status @status +else + json.status false +end diff --git a/app/views/origami/alipay/index.html.erb b/app/views/origami/alipay/index.html.erb new file mode 100755 index 00000000..a9959512 --- /dev/null +++ b/app/views/origami/alipay/index.html.erb @@ -0,0 +1,258 @@ +
    + + +
    +
    + + + +
    +
    +
    + <% if @bank_integration == '1' %> +
    +
    + + +
    +
    +
    + <% end %> +
    +
    + + <%@can_alipay = @can_alipay +@rounding_adj%> + +
    +
    +
    + <% if @alipaycount != 0 %> +
    +
    + + +
    +
    +
    + <% end %> +
    +
    + + +
    +
    +
    +
    +
    +
    + +
    0.0
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    1
    +
    2
    +
    3
    +
    +
    +
    4
    +
    5
    +
    6
    +
    +
    +
    7
    +
    8
    +
    9
    +
    +
    +
    0
    +
    .
    +
    00
    +
    +
    +
    Nett
    +
    Del
    +
    Clr
    +
    +
    +
    +
    +
    1000
    +
    3000
    +
    +
    +
    5000
    +
    10000
    +
    +
    +
    Pay
    +
    +
    +
    +
    +
    + +
    + + +
    +
    +
    + + diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index eb3eefe3..c33b6493 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -182,103 +182,125 @@
    <% if @other != 0.0 %> -
    -
    -
    MPU
    -
    <%= number_with_precision(@other, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
    -
    +
    <% else %> - + <% if @ppamount != 0.0 %>
    -
    -
    Redeem
    -
    <%= number_with_precision(@ppamount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
    -
    <% else %> - <% end %> + <% if @visacount != 0.0 %>
    -
    -
    VISA
    -
    <%= number_with_precision(@visacount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
    -
    <% else %> - <% end %> + <% if @jcbcount != 0.0 %>
    -
    -
    JCB
    -
    <%= number_with_precision(@jcbcount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
    -
    <% else %> - <% end %> + <% if @mastercount != 0.0 %>
    -
    -
    MASTER
    -
    <%= number_with_precision(@mastercount, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i ) %>
    -
    <% else %> - <% end %> + <% if @unionpaycount != 0.0 %>
    -
    -
    UNIONPAY
    -
    <%= number_with_precision(@unionpaycount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
    -
    <% else %> + + + <% if @alipaycount != 0.0 %> +
    + <% else %> + + <% if @junctionpaycount != 0.0 %>
    -
    -
    JUNCTION PAY
    -
    <%= number_with_precision(@junctionpaycount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
    -
    <% else %> - <% end %> + +
    Balance
    <%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i ) %>
    @@ -584,6 +606,9 @@ var customer_name = "<%= @customer.name %>"; else if(payment_type == "UNIONPAY" && $('#unionpaycount').text()==0 && sub_total != 0.0){ swal("Oops","Please Pay with UNIONPAY Payment","warning"); } + else if(payment_type == "Alipay" && $('#alipaycount').text()==0 && sub_total != 0.0){ + swal("Oops","Please Pay with Alipay Payment","warning"); + } else if(payment_type == "JUNCTIONPAY" && $('#junctionpaycount').text()==0 && sub_total != 0.0){ swal("Oops","Please Pay with JUNCTIONPAY Payment","warning"); } @@ -866,8 +891,9 @@ var customer_name = "<%= @customer.name %>"; var jcb1 = $('#jcbcount').text(); var master1 = $('#mastercount').text(); var unionpay1 = $('#unionpaycount').text(); + var alipay1 = $('#alipaycount').text(); var junctionpay1 = $('#junctionpaycount').text(); - var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1) + parseFloat(junctionpay1); + var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1) + parseFloat(alipay1) + parseFloat(junctionpay1); var total = $('#amount_due').text(); var amt = 0; <% if precision.to_i > 0 %>; @@ -895,9 +921,10 @@ var customer_name = "<%= @customer.name %>"; var jcb = $('#jcbcount').text(); var master = $('#mastercount').text(); var unionpay = $('#unionpaycount').text(); + var alipay = $('#alipaycount').text(); var junctionpay = $('#junctionpaycount').text(); var amount_due = $('#amount_due').text(); - var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) + parseFloat(junctionpay) + var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master) + parseFloat(unionpay) + parseFloat(alipay) + parseFloat(junctionpay) var result = parseFloat(amount_due) - parseFloat(total); <% if precision.to_i > 0 %> $('#balance').text(parseFloat(result).toFixed(<%= precision %>)); diff --git a/config/locales/en.yml b/config/locales/en.yml index 84a7b03a..dba88aee 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -122,6 +122,8 @@ en: mpu: "MPU" jcb: "JCB" visa: "VISA" + master: "MASTER" + alipay: "Alipay" credit: "CREDIT" other_payment: "Other Payment" percentage: "PERCENTAGE" @@ -412,6 +414,7 @@ en: redeem_sales: "Redeem Sales" cash_sales: "Cash Sales" credit_sales: "Credit Sales" + alipay_sales: "Alipay Sales" foc_sales: "FOC Sales" foc_item: "Item FOC" net_amount: "Net Amount" diff --git a/config/locales/mm.yml b/config/locales/mm.yml index f18136c4..e06733e9 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -117,6 +117,8 @@ mm: mpu: "MPU" jcb: "JCB" visa: "VISA" + master: "MASTER" + alipay: "Alipay" credit: "အကြွေး" other_payment: "အခြားငွေပေးဆောင်မှုများ" percentage: "ရာခိုင်နှုန်း" @@ -404,6 +406,7 @@ mm: master_sales: "Master ရောင်းရငွေ" visa_sales: "Visa ရောင်းရငွေ" jcb_sales: "JCB ရောင်းရငွေ" + alipay_sales: "Alipay ရောင်းရငွေ" redeem_sales: "ဆုကြေးပြန်သုံးငွေနှင့် ရောင်းရငွေ" cash_sales: "ငွေသား ရောင်းရငွေ" credit_sales: "အကြွေး ရောင်းရငွေ" diff --git a/config/routes.rb b/config/routes.rb index 233d7e04..6416f236 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -181,6 +181,8 @@ scope "(:locale)", locale: /en|mm/ do post 'payment/paypar' => 'paypar_payments#create' post 'payment/credit' => 'credit_payments#create' post 'payment/voucher' => 'voucher_payments#create' + post 'payment/alipay' => 'alipay#create' + post 'payment/junctionpay' => 'junctionpay#create' get 'sale/:sale_id/:type/payment/credit_payment' => "credit_payments#index" get 'sale/:sale_id/:type/payment/others_payment' => "others_payments#index" @@ -191,6 +193,8 @@ scope "(:locale)", locale: /en|mm/ do get 'sale/:sale_id/:type/payment/others_payment/UNIONPAY' => "unionpay#index" get 'sale/:sale_id/:type/payment/others_payment/Redeem' => "redeem_payments#index" get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index" + get 'sale/:sale_id/:type/payment/others_payment/JunctionPay' => "junction_pay#index" + get 'sale/:sale_id/:type/payment/others_payment/Alipay' => "alipay#index" #---------Void --------------# post 'sale/:sale_id/:type/void' => 'void#overall_void' diff --git a/spec/controllers/origami/alipay_controller_spec.rb b/spec/controllers/origami/alipay_controller_spec.rb new file mode 100644 index 00000000..5994c9fa --- /dev/null +++ b/spec/controllers/origami/alipay_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Origami::AlipayController, type: :controller do + +end From 40175d64cdd9dc54ee77d645fdcaa6b63383c6bc Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 30 Mar 2018 15:38:48 +0630 Subject: [PATCH 20/30] remove puma backup --- config/puma.rb.backup | 48 ------------------------------------------- 1 file changed, 48 deletions(-) delete mode 100755 config/puma.rb.backup diff --git a/config/puma.rb.backup b/config/puma.rb.backup deleted file mode 100755 index c8e0145e..00000000 --- a/config/puma.rb.backup +++ /dev/null @@ -1,48 +0,0 @@ -# Puma can serve each request in a thread from an internal thread pool. -# The `threads` method setting takes two numbers a minimum and maximum. -# Any libraries that use thread pools should be configured to match -# the maximum value specified for Puma. Default is set to 5 threads for minimum -# and maximum, this matches the default thread size of Active Record. -# -threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i -threads threads_count, threads_count - -# Specifies the `port` that Puma will listen on to receive requests, default is 3000. -# -port ENV.fetch("PORT") { 3000 } - -# Specifies the `environment` that Puma will run in. -# -environment ENV.fetch("RAILS_ENV") { "development" } - -# Specifies the number of `workers` to boot in clustered mode. -# Workers are forked webserver processes. If using threads and workers together -# the concurrency of the application would be max `threads` * `workers`. -# Workers do not work on JRuby or Windows (both of which do not support -# processes). -# -# workers ENV.fetch("WEB_CONCURRENCY") { 2 } - -# Use the `preload_app!` method when specifying a `workers` number. -# This directive tells Puma to first boot the application and load code -# before forking the application. This takes advantage of Copy On Write -# process behavior so workers use less memory. If you use this option -# you need to make sure to reconnect any threads in the `on_worker_boot` -# block. -# -# preload_app! - -# The code in the `on_worker_boot` will be called if you are using -# clustered mode by specifying a number of `workers`. After each worker -# process is booted this block will be run, if you are using `preload_app!` -# option you will want to use this block to reconnect to any threads -# or connections that may have been created at application boot, Ruby -# cannot share connections between processes. -# -# on_worker_boot do -# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) -# end - -# Allow puma to be restarted by `rails restart` command. - -plugin :tmp_restart From 298fc9a3f078bde7a449a58c0f742b28c4412321 Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 30 Mar 2018 15:48:55 +0630 Subject: [PATCH 21/30] merge with second display --- app/assets/javascripts/origami.js | 3 +++ app/views/origami/alipay/index.html.erb | 1 + app/views/origami/junction_pay/index.html.erb | 1 + config/initializers/action_controller.rb | 10 +++++----- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 1cbc63ed..42fca385 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -24,6 +24,9 @@ _IN_DUTIES_ = "/   IN DUTIES"; _JCB_ = "/   JCB PAYMENT"; _MASTER_ = "/   MASTER PAYMENT"; _MPU_ = "/   MPU PAYMENT"; +_ALIPAY_ = "/   Alipay"; +_JUNCTIONPAY_ = "/   JunctionPay"; +_PAYMAL_ = "/   Paymal"; _OTHER_CHARGES_ = "/   CHARGES"; _OTHER_PAYMENTS_ = "/   OTHER PAYMENT"; _PAYMENTS_ = "/   PAYMENT"; diff --git a/app/views/origami/alipay/index.html.erb b/app/views/origami/alipay/index.html.erb index a9959512..abd065fb 100755 --- a/app/views/origami/alipay/index.html.erb +++ b/app/views/origami/alipay/index.html.erb @@ -124,6 +124,7 @@ \ No newline at end of file From e6d11644bbb32c524302d84ac8fe845d946a0b3d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 2 Apr 2018 11:40:18 +0630 Subject: [PATCH 25/30] update menu astron for no option --- app/assets/javascripts/addorder.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 47c6cd4f..31209c99 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -381,16 +381,18 @@ $(function() { item = get_set_item(items); customer_display_view(item,"set_add"); - var option = '' + var option = [] attribute_arr = [] var rowCount = $('.summary-items tbody tr').length+1; code = $('.set-item').attr('data-code'); name = $('.set-item').attr('data-name'); price = $('.set-item').attr('data-price'); - option = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options'); + option_name = ($('.set-item').attr('data-options') === 'undefined') ? '' :$('.set-item').attr('data-options'); + option = ($('.set-item').attr('data-options') === '') ? '[]' :$('.set-item').attr('data-options'); parent = $('.set-item').attr('data-parent'); total = qty * price ; + row ="" +''+rowCount+'' - +'' + item_name+ ' ' + name +' ' + option +'' + +'' + item_name+ ' ' + name +' ' + option_name +'' +'' + qty + '' +'' + parseFloat(total).toFixed(2) @@ -406,15 +408,16 @@ $(function() { +''; $(".summary-items tbody").append(row); var rowCount = $('.summary-items tbody tr').length+1; - var set_option = '' + var set_option = [] $(items).each(function(i){ code = $(items[i]).attr('data-code'); name = $(items[i]).attr('data-name'); price = $(items[i]).attr('data-price'); - set_option = ($(items[i]).attr('data-options') === 'undefined') ? ' ' :$(items[i]).attr('data-options'); - + set_option_name = ($(items[i]).attr('data-options') === 'undefined') ? ' ' :$(items[i]).attr('data-options'); + set_option= ($(items[i]).attr('data-options') === '') ? '[]' :$(items[i]).attr('data-options'); sub_item = $(items[i]).attr('data-sub-item'); total = qty * price ; + row ="" +''+rowCount+'' - +'' + item_name+ ' ' + name +' ' + set_option +'' + +'' + item_name+ ' ' + name +' ' + set_option_name +'' +'' + qty + '' +'' + parseFloat(total).toFixed(2) From d59ff8c6eb7669d82c14294405460920f6072574 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 2 Apr 2018 12:50:02 +0630 Subject: [PATCH 26/30] update show table for instance set --- app/views/origami/home/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index b108c46d..494decbe 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -300,7 +300,7 @@ <% end %> <% end %> - <% if !order_item.set_menu_items.nil? + <% if !order_item.set_menu_items.nil? && order_item.set_menu_items != '[]' JSON.parse(order_item.set_menu_items).each do |item_instance| %>
    <%= item_instance["item_instance_name"] %> From 5155fd5221e866fc02c06a4a3c13c34ceea48495 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 2 Apr 2018 13:09:16 +0630 Subject: [PATCH 27/30] update show table for instance set --- app/views/origami/rooms/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index e2f04018..5bc46c84 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -370,7 +370,7 @@ <% end %> <% end %> - <% if !order_item.set_menu_items.nil? + <% if !order_item.set_menu_items.nil? && order_item.set_menu_items != '[]' JSON.parse(order_item.set_menu_items).each do |item_instance| %>
    <%= item_instance["item_instance_name"] %> From 3e0742c66073b8f264678d59f70943beea9191a8 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 2 Apr 2018 14:06:22 +0630 Subject: [PATCH 28/30] reduce scroll speed in wIter app --- app/assets/javascripts/custom.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 778de553..c6e6a47b 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -10,7 +10,7 @@ $(document).ready(function() { alwaysVisible: false, borderRadius: '0', railBorderRadius: '0', - touchScrollStep : 25 + touchScrollStep : 50 }); $('#order-detail-slimscroll').slimScroll({ @@ -20,7 +20,7 @@ $(document).ready(function() { alwaysVisible: false, borderRadius: '0', railBorderRadius: '0', - touchScrollStep : 25 + touchScrollStep : 50 }); $('#menu-slimscroll').slimScroll({ @@ -30,7 +30,7 @@ $(document).ready(function() { alwaysVisible: false, borderRadius: '0', railBorderRadius: '0', - touchScrollStep : 25 + touchScrollStep : 50 }); // $('.delete').click(function(){ From 9d9a07b100c33bb465686b875cd22c0c7a2770b2 Mon Sep 17 00:00:00 2001 From: phyusin Date: Tue, 3 Apr 2018 12:59:33 +0630 Subject: [PATCH 29/30] change clear data --- lib/tasks/clear_data.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake index 9d476d67..247992be 100755 --- a/lib/tasks/clear_data.rake +++ b/lib/tasks/clear_data.rake @@ -17,7 +17,7 @@ namespace :clear do Survey.delete_all DiningFacility.update_all(status:'available') CashierTerminal.update_all(is_currently_login: 0) - SeedGenerator.where("id > 1").update(:current => 0, :next => 1) + SeedGenerator.where("id > 1").update(:current => 0, :next => 0) puts "Clear Data Done." end From d29b7a9d498933dbd2822c2c0514568d966a0d00 Mon Sep 17 00:00:00 2001 From: phyusin Date: Tue, 3 Apr 2018 14:15:35 +0630 Subject: [PATCH 30/30] change update order item func: --- app/controllers/oqs/edit_controller.rb | 50 ++++++++++++++----------- app/controllers/oqs/print_controller.rb | 2 +- 2 files changed, 29 insertions(+), 23 deletions(-) diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb index ccef4e4a..049bbda6 100644 --- a/app/controllers/oqs/edit_controller.rb +++ b/app/controllers/oqs/edit_controller.rb @@ -36,33 +36,39 @@ class Oqs::EditController < BaseOqsController if ENV["SERVER_MODE"] != "cloud" #no print in cloud server # print assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code) - # order queue stations - oqs = assigned_item.order_queue_station - - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'") - unique_code="OrderItemPdf" - if !order_slim_pdf.empty? - order_slim_pdf.each do |order_item_slim| - if order_item_slim[0] == 'OrderSlimPdf' - if order_item_slim[1] == '1' - unique_code="OrderItemSlimPdf" - else - unique_code="OrderItemPdf" - end - elsif order_item_slim[0] == 'OrderSetPdf' - if order_item_slim[1] == '1' - unique_code="OrderSetItemPdf" - else - unique_code="OrderItemPdf" + if !assigned_items.nil? + assigned_items.each do |assign_item| + # order queue stations + oqs = assign_item.order_queue_station + + order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + + unique_code="OrderItemPdf" + if !order_slim_pdf.empty? + order_slim_pdf.each do |order_item_slim| + if order_item_slim[0] == 'OrderSlimPdf' + if order_item_slim[1] == '1' + unique_code="OrderItemSlimPdf" + else + unique_code="OrderItemPdf" + end + elsif order_item_slim[0] == 'OrderSetPdf' + if order_item_slim[1] == '1' + unique_code="OrderSetItemPdf" + else + unique_code="OrderItemPdf" + end + end end end + + print_settings=PrintSetting.find_by_unique_code(unique_code) + order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) + order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty ) end end - - print_settings=PrintSetting.find_by_unique_code(unique_code) - order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) - order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty ) end end diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index baa4af40..930d3d5c 100755 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -26,7 +26,7 @@ class Oqs::PrintController < ApplicationController assigned_item_id = params[:id] options = params[:options] assigned_item = AssignedOrderItem.find(assigned_item_id) - assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); + assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'") # order queue stations oqs = assigned_item.order_queue_station