diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index c893bb64..aab34b42 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -47,8 +47,12 @@ class Api::OrdersController < Api::ApiController # end @shop = Shop.first + puts "Hello world" + puts @shop.to_json + return @shop.to_json end + # Description # This API allow new order creation # Input Params diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb index a6b57134..6b055fc2 100755 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -31,34 +31,34 @@ <%= t("views.right_panel.detail.date") %> <%= t("views.right_panel.detail.void_amount") %> <% if @payment_methods.include? ("MPU") %> - <%= t("views.right_panel.detail.mpu_sales") %> + <%= t("views.right_panel.detail.mpu_sales") %> <% end %> <% if @payment_methods.include? ("Master") %> - <%= t("views.right_panel.detail.master_sales") %> + <%= t("views.right_panel.detail.master_sales") %> <% end %> <% if @payment_methods.include? ("VISA") %> - <%= t("views.right_panel.detail.visa_sales") %> + <%= t("views.right_panel.detail.visa_sales") %> <% end %> <% if @payment_methods.include? ("JCB") %> - <%= t("views.right_panel.detail.jcb_sales") %> + <%= t("views.right_panel.detail.jcb_sales") %> <% end %> <% if @payment_methods.include? ("UNIONPAY") %> - <%= t("views.right_panel.detail.unionpay_sales") %> + <%= t("views.right_panel.detail.unionpay_sales") %> <% end %> <% if @payment_methods.include? ("Alipay") %> - <%= t("views.right_panel.detail.alipay_sales") %> + <%= t("views.right_panel.detail.alipay_sales") %> <% end %> <% if @payment_methods.include? ("PAYMAL") %> - <%= t("views.right_panel.detail.paymal_sales") %> + <%= t("views.right_panel.detail.paymal_sales") %> <% end %> <% if @payment_methods.include? ("DINGA") %> - <%= t("views.right_panel.detail.dinga_sales") %> + <%= t("views.right_panel.detail.dinga_sales") %> <% end %> <% if @payment_methods.include? ("JunctionPay") %> - <%= t("views.right_panel.detail.junctionpay_sales") %> + <%= t("views.right_panel.detail.junctionpay_sales") %> <% end %> <% if @payment_methods.include? ("Redeem") %> - <%= t("views.right_panel.detail.redeem_sales") %> + <%= t("views.right_panel.detail.redeem_sales") %> <% end %> <%= t("views.right_panel.detail.cash_sales") %> <%= t("views.right_panel.detail.credit_sales") %> diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb index b8bf01b8..d441e48e 100755 --- a/app/views/reports/dailysale/index.xls.erb +++ b/app/views/reports/dailysale/index.xls.erb @@ -19,7 +19,7 @@ <%= t("views.right_panel.detail.date") %> <%= t("views.right_panel.detail.void_amount") %> <% if @payment_methods.include? ("MPU") %> - <%= t("views.right_panel.detail.mpu_sales") %> + <%= t("views.right_panel.detail.mpu_sales") %> <% end %> <% if @payment_methods.include? ("Master") %> <%= t("views.right_panel.detail.master_sales") %> diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb index f9b4e233..e5382b87 100755 --- a/app/views/reports/shiftsale/index.html.erb +++ b/app/views/reports/shiftsale/index.html.erb @@ -54,8 +54,8 @@ <%= t("views.right_panel.detail.cash_payment") %> <%= t("views.right_panel.detail.credit_payment") %> - <%= t("views.btn.other_payment") %> - <%= t("views.btn.foc") %> <%= t :payment %> + <%= t("views.btn.other_payment") %> + <%= t("views.btn.foc") %> <%= t :payment %> diff --git a/dump.rdb b/dump.rdb index 87e22f1d..99b6899f 100644 Binary files a/dump.rdb and b/dump.rdb differ