diff --git a/app/assets/stylesheets/BSBMaterial/style.css b/app/assets/stylesheets/BSBMaterial/style.css index ed00c5f5..a4620cf5 100755 --- a/app/assets/stylesheets/BSBMaterial/style.css +++ b/app/assets/stylesheets/BSBMaterial/style.css @@ -2323,7 +2323,7 @@ @media (max-width: 767px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { - margin-left: 35px; + margin-left: 15px; width: 73%; } .navbar .navbar-header { display: inline-block; @@ -8054,4 +8054,3 @@ html.ie11 .dropdown-menu ul.menu li a { html.ie11 .bs-searchbox .form-control { width: 90%; } - diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index 2febb6d0..ae2de4d8 100755 --- a/app/assets/stylesheets/CRM.scss +++ b/app/assets/stylesheets/CRM.scss @@ -313,10 +313,34 @@ i.logout_icon{ } .page-header{ - width: 100%; + width: 100% !important; } .ls-closed .bars:after, .ls-closed .bars:before{ top: 14px; } + + .mbl_card{ + width: 100% !important; + } + + .mbl_lbl{ + display: none; + } + + .mbl-style{ + padding: 10px 10px; + } + + .m-auto{ + width: 33%; + } + + .online_order{ + text-align: right; + } + + .mbl-right-btn{ + text-align: right; + } } diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss index 11fa7952..3e49913d 100755 --- a/app/assets/stylesheets/OQS.scss +++ b/app/assets/stylesheets/OQS.scss @@ -165,10 +165,34 @@ i.logout_icon{ } .page-header{ - width: 100%; + width: 100% !important; } .ls-closed .bars:after, .ls-closed .bars:before{ top: 14px; } + + .mbl_card{ + width: 100% !important; + } + + .mbl_lbl{ + display: none; + } + + .mbl-style{ + padding: 10px 10px; + } + + .m-auto{ + width: 33%; + } + + .online_order{ + text-align: right; + } + + .mbl-right-btn{ + text-align: right; + } } diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 9c5fc64f..93761efe 100755 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -175,10 +175,34 @@ i.logout_icon{ } .page-header{ - width: 100%; + width: 100% !important; } .ls-closed .bars:after, .ls-closed .bars:before{ top: 14px; } + + .mbl_card{ + width: 100% !important; + } + + .mbl_lbl{ + display: none; + } + + .mbl-style{ + padding: 10px 10px; + } + + .m-auto{ + width: 33%; + } + + .online_order{ + text-align: right; + } + + .mbl-right-btn{ + text-align: right; + } } diff --git a/app/assets/stylesheets/inventory_definitions.scss b/app/assets/stylesheets/inventory_definitions.scss index e9eb5d80..d134fbd7 100755 --- a/app/assets/stylesheets/inventory_definitions.scss +++ b/app/assets/stylesheets/inventory_definitions.scss @@ -324,10 +324,34 @@ i.logout_icon{ } .page-header{ - width: 100%; + width: 100% !important; } .ls-closed .bars:after, .ls-closed .bars:before{ top: 14px; } + + .mbl_card{ + width: 100% !important; + } + + .mbl_lbl{ + display: none; + } + + .mbl-style{ + padding: 10px 10px; + } + + .m-auto{ + width: 33%; + } + + .online_order{ + text-align: right; + } + + .mbl-right-btn{ + text-align: right; + } } diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 5d933f39..6bbce5a3 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -703,10 +703,34 @@ nav.pagination .page a:hover, } .page-header{ - width: 100%; + width: 100% !important; } .ls-closed .bars:after, .ls-closed .bars:before{ top: 14px; } + + .mbl_card{ + width: 100% !important; + } + + .mbl_lbl{ + display: none; + } + + .mbl-style{ + padding: 10px 10px; + } + + .m-auto{ + width: 33%; + } + + .online_order{ + text-align: right; + } + + .mbl-right-btn{ + text-align: right; + } } diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 3dd2c92a..0f9890d7 100755 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -99,23 +99,23 @@ to_time = '' end %> -
- +
+
-
- +
+
-
- +
+
-
- +
+
diff --git a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb index d3afcbfe..166299f0 100755 --- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb +++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb @@ -1,10 +1,10 @@
- + <%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %> <% if period_type != false %>
-
- +
+ -
+
- +
-
- +
+
-
+

-
-
+
+
<% end %>
@@ -44,11 +44,11 @@ <% end %> <% if defined? menu_types %> - <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %> + <%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %> <% end %> <% if defined? payments %> - <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> + <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> <% end %> <% if defined? shift_name %> @@ -63,31 +63,31 @@ <% if defined? singer %> <%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %> <% end %> - - <% if defined? bsm %> + + <% if defined? bsm %> <%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %> - <% end %> - + <% end %> + <% if defined? guest_role %> <%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %> <% end %> - + <% if defined? list_by_payment_type %> - <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %> - <% end %> - - <% if defined? products %> - <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %> + <%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %> <% end %> - <% if defined? items %> - <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %> + <% if defined? products %> + <%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %> + <% end %> + + <% if defined? items %> + <%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %> <% end %>
- -<% end %> -
+ +<% end %> +
\ No newline at end of file + diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb index 9e5664df..d72be97c 100755 --- a/app/views/reports/dailysale/index.html.erb +++ b/app/views/reports/dailysale/index.html.erb @@ -1,5 +1,5 @@ -
+
  1. <%= t("views.right_panel.button.home") %>
  2. <%= t("views.right_panel.detail.daily_sale_report") %>
    3. @@ -19,12 +19,12 @@
    -
    +
    - + @@ -181,33 +181,63 @@ <% if @payment_methods.include? ("MPU") %> + <% if !request.user_agent.include? "Mobile" %> + <% colspan += 1 %> + <% end %> <% end%> <% if @payment_methods.include? ("Master") %> + <% if !request.user_agent.include? "Mobile" %> + <% colspan += 1 %> + <% end %> <% end%> <% if @payment_methods.include? ("VISA") %> + <% if !request.user_agent.include? "Mobile" %> + <% colspan += 1 %> + <% end %> <% end%> <% if @payment_methods.include? ("JCB") %> + <% if !request.user_agent.include? "Mobile" %> + <% colspan += 1 %> + <% end %> <% end%> <% if @payment_methods.include? ("UNIONPAY") %> + <% if !request.user_agent.include? "Mobile" %> + <% colspan += 1 %> + <% end %> <% end %> <% if @payment_methods.include? ("Alipay") %> + <% if !request.user_agent.include? "Mobile" %> + <% colspan += 1 %> + <% end %> <% end %> <% if @payment_methods.include? ("PAYMAL") %> + <% if !request.user_agent.include? "Mobile" %> + <% colspan += 1 %> + <% end %> <% end %> <% if @payment_methods.include? ("DINGA") %> + <% if !request.user_agent.include? "Mobile" %> + <% colspan += 1 %> + <% end %> <% end %> <% if @payment_methods.include? ("JunctionPay") %> + <% if !request.user_agent.include? "Mobile" %> + <% colspan += 1 %> + <% end %> <% end %> <% if @payment_methods.include? ("Redeem") %> + <% if !request.user_agent.include? "Mobile" %> + <% colspan += 1 %> + <% end %> <% end %> diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index 1265e988..205c330a 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -23,9 +23,9 @@ class ActionController::Base # check for license file if check_license current_license(ENV["SX_PROVISION_URL"]) - else - redirect_to activate_path - end + else + redirect_to activate_path + 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.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.sr") %>
    Total<%= number_with_precision(mpu , precision:precision.to_i,delimiter:delimiter) rescue '-'%><%= number_with_precision(master, precision:precision.to_i,delimiter:delimiter) rescue '-'%><%= number_with_precision(visa, precision:precision.to_i,delimiter:delimiter) rescue '-'%><%= number_with_precision(jcb, precision:precision.to_i,delimiter:delimiter) rescue '-'%><%= number_with_precision(unionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%><%= number_with_precision(alipay, precision:precision.to_i,delimiter:delimiter) rescue '-'%><%= number_with_precision(paymal, precision:precision.to_i,delimiter:delimiter) rescue '-'%><%= number_with_precision(dinga, precision:precision.to_i,delimiter:delimiter) rescue '-'%><%= number_with_precision(junctionpay, precision:precision.to_i,delimiter:delimiter) rescue '-'%><%= number_with_precision(paypar, precision:precision.to_i,delimiter:delimiter) rescue '-'%><%= number_with_precision(cash, precision:precision.to_i,delimiter:delimiter) rescue '-'%>