fix date in sale tran

This commit is contained in:
NyanLinHtut
2019-10-03 09:48:01 +06:30
parent 3505547052
commit 971b1da98c
3 changed files with 42 additions and 43 deletions

View File

@@ -65,11 +65,11 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td><%= @sale.receipt_date.strftime("%d-%M-%Y") %></td> <td><%= @sale.receipt_date.strftime("%d-%m-%Y") %></td>
<td><%= @sale.receipt_no %></td> <td><%= @sale.receipt_no %></td>
<td><%= @sale.cashier_name rescue '-' %></td> <td><%= @sale.cashier_name rescue '-' %></td>
<td><%= @sale.sale_status %> </td> <td><%= @sale.sale_status %> </td>
<td colspan="2"> <%= @sale.requested_at.strftime("%m-%d-%Y %H:%M %p") %> </td> <td colspan="2"> <%= @sale.requested_at.strftime("%d-%m-%Y %H:%M %p") %> </td>
</tr> </tr>
<tr style="border-top:2px solid #000"> <tr style="border-top:2px solid #000">
<th><%= t :sale %> <%= t("views.right_panel.detail.item_txt") %> <%= t("views.right_panel.detail.name_txt2") %></th> <th><%= t :sale %> <%= t("views.right_panel.detail.item_txt") %> <%= t("views.right_panel.detail.name_txt2") %></th>
@@ -454,4 +454,3 @@
window.location = '/origami/sale/'+sale_id+'/transaction/payment'; window.location = '/origami/sale/'+sale_id+'/transaction/payment';
}); });
</script> </script>

View File

@@ -21,11 +21,11 @@ class ActionController::Base
end end
else else
# check for license file # check for license file
# if check_license if check_license
# current_license(ENV["SX_PROVISION_URL"]) current_license(ENV["SX_PROVISION_URL"])
# else else
# redirect_to activate_path redirect_to activate_path
# end end
end end
end end

View File

@@ -1,11 +1,11 @@
# application_path="#{File.expand_path("../..", __FILE__)}" application_path="#{File.expand_path("../..", __FILE__)}"
# directory application_path directory application_path
# #environment ENV.fetch("RAILS_ENV") { "production" } #environment ENV.fetch("RAILS_ENV") { "production" }
# environment "production" environment "production"
# pidfile "#{application_path}/tmp/puma/pid" pidfile "#{application_path}/tmp/puma/pid"
# state_path "#{application_path}/tmp/puma/state" state_path "#{application_path}/tmp/puma/state"
# stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
# port ENV.fetch("PORT") { 62158 } port ENV.fetch("PORT") { 62158 }
# workers 2 workers 2
# preload_app! preload_app!
# threads 1,1 threads 1,1