From 9440bcfa7e220c68dcd99f8fed4524dfaec1b792 Mon Sep 17 00:00:00 2001
From: PPK <moethandar@code2lab.com>
Date: Wed, 29 May 2019 17:34:43 +0630
Subject: [PATCH] Update Reort

---
 app/controllers/api/orders_controller.rb   |   4 ++++
 app/views/reports/dailysale/index.html.erb |  20 ++++++++++----------
 app/views/reports/dailysale/index.xls.erb  |   2 +-
 app/views/reports/shiftsale/index.html.erb |   4 ++--
 dump.rdb                                   | Bin 1084 -> 3868 bytes
 5 files changed, 17 insertions(+), 13 deletions(-)

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 @@
 									<th style='text-align:center;'><%= t("views.right_panel.detail.date") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.void_amount") %></th>
 									<% if @payment_methods.include? ("MPU") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.mpu_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.mpu_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("Master") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.master_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.master_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("VISA") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.visa_sales") %></th>
+										<th style='text-align:center;'class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.visa_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("JCB") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.jcb_sales") %></th>
+										<th style='text-align:center;'class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.jcb_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("UNIONPAY") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.unionpay_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.unionpay_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("Alipay") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.alipay_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.alipay_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("PAYMAL") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.paymal_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.paymal_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("DINGA") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.dinga_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.dinga_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("JunctionPay") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.junctionpay_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.junctionpay_sales") %></th>
 									<% end %>
 									<% if @payment_methods.include? ("Redeem") %>
-										<th style='text-align:center;'><%= t("views.right_panel.detail.redeem_sales") %></th>
+										<th style='text-align:center;' class="d-none d-sm-table-cell"><%= t("views.right_panel.detail.redeem_sales") %></th>
 									<% end %>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.cash_sales") %></th>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.credit_sales") %></th>
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 @@
 								<th style='text-align:center;'><%= t("views.right_panel.detail.date") %></th>
 								<th style='text-align:center;'><%= t("views.right_panel.detail.void_amount") %></th>
 								<% if @payment_methods.include? ("MPU") %>
-									<th style='text-align:center;'><%= t("views.right_panel.detail.mpu_sales") %></th>
+									<th style='text-align:center;' class='mobile'><%= t("views.right_panel.detail.mpu_sales") %></th>
 								<% end %>
 								<% if @payment_methods.include? ("Master") %>
 									<th style='text-align:center;'><%= t("views.right_panel.detail.master_sales") %></th>
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 @@
 						<th><%= t("views.right_panel.detail.cash_payment") %></th>
 						<!-- <th>Credit Charges</th> -->
 						<th><%= t("views.right_panel.detail.credit_payment") %></th>
-						<th><%= t("views.btn.other_payment") %></th>
-						<th><%= t("views.btn.foc") %> <%= t :payment %></th>
+						<th class="d-none d-sm-table-cell"><%= t("views.btn.other_payment") %></th>
+						<th class="d-none d-sm-table-cell"><%= t("views.btn.foc") %> <%= t :payment %></th>
 					<!-- <th>Grand Total 
 					<br/>Rounding Adj</th> -->						
 					<!-- <th>Rounding Adj</th> -->
diff --git a/dump.rdb b/dump.rdb
index 87e22f1d49653abdc6c0f99faa01b9c718bc686f..99b6899f68e00045419078e588b2d46029c6f5a1 100644
GIT binary patch
literal 3868
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
CZUEW<

literal 1084
zcmaJ=L5tHs7@d@~tL|E44~h%YGI)|snM{&q5-$}LT*ZqXJgC&9nQkLV(<YOJBKsRW
zivA5Rf(O&xiy-(1ym<Bpc!+g%npWK{$sUvUz3;v6ecwF1b9?s@#+YX3Bj$QB+GkNs
zYvZ<}WEYly9FNCoH>>u!7qCM!`}#CHm&D9P0SgZA{@McBmK_ezIAV6-_$&p-;OEW;
zsK?yq);J3LEEd(X&(i$u_jeCoNdSPWr!k9Q#Y9*~n9g1Uu$iL++w+;5R>0*GpNmQZ
zVFM{N1w{x&#1u$@Ku#l_Vw!;nE~Vu?Yo$FGR_0%jdjIUvjFc4_7RtiYfByQk%Uq0N
z+Z3t7_WVcv<K#?nMW1~FmD(g>35%r-mksR1=Oq&@o0fp9pw?ZAaD`E&G{O~FKoe@^
zG>R}urTOD)_ddK3cO&ogLzfZXb}W?=)6yKQ(~jvnL^I^-B=H!Rd6Y2O8x6vv?)&ah
z<0Tx1F(26hgBJYDhAk*=D&oxTHEa$oMb`~#Vy#2ls)i|{S__Un7cNw)W(#tAuX*#L
z8^k@A?fc<4U?bkV)#!(#eiB7&)Sp6&=q<R+7g|qXo-pvc*Dnpdy<u-0d12)7DSXy~
z%>#)Ept&h|ZgaPL<(u^8c~n0&3p|h=X7lZZFOy(m8f`<NCQ+&EB=J;i{NGDjPjvN+
gN*A$;dz~ismuG$Amex!1&WfH^eyd7+e4`qGKV(=_ZU6uP