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 @@
- <% if @payment_method_setting_nav.present? %>
-
- <% end %>
-
+
+