diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b1879bba..77dbb850 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -33,47 +33,6 @@ $(document).on('turbolinks:load', function() { }); $('.datepicker').attr('ReadOnly','true'); $('.datepicker').css('cursor','pointer'); - - // Image Upload - $("#simple_menu_item_image_path").fileinput({ - previewFileType: "image", - allowedFileExtensions: ["jpg", "gif", "png"], - browseClass: "btn btn-success", - browseLabel: "Pick Image", - browseIcon: " ", - removeClass: "btn btn-danger", - removeLabel: "Delete", - removeIcon: " ", - showUpload: false, - // uploadClass: "btn btn-info", - // uploadLabel: "Upload", - // uploadIcon: " ", - previewTemplates: { - image: '
\n' + - ' {caption}\n' + - '
\n', - } - }); - - $("#product_image_path").fileinput({ - previewFileType: "image", - allowedFileExtensions: ["jpg", "gif", "png"], - browseClass: "btn btn-success", - browseLabel: "Pick Image", - browseIcon: " ", - removeClass: "btn btn-danger", - removeLabel: "Delete", - removeIcon: " ", - showUpload: false, - // uploadClass: "btn btn-info", - // uploadLabel: "Upload", - // uploadIcon: " ", - previewTemplates: { - image: '
\n' + - ' {caption}\n' + - '
\n', - } - }); }); $(document).on("focus", "[data-behaviour~='datepicker']", function(e){ diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 63e64159..f0db5df8 100644 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -11,10 +11,38 @@ // min-height: 75rem; // padding-top: 4.5rem; // } + +/* Reset */ +.table { + margin-bottom: 0px; +} + +select.form-control { + height: inherit !important; +} + +.form-horizontal .form-group { + margin-right: 0px !important; +} + .card-columns { font-size: 18px !important; } +/* End Reset */ + +.dining { + min-height:470px; + max-height:570px; + overflow:auto +} + +.order-info { + min-height:300px; + max-height:500px; + overflow:auto +} + .others-payment{ line-height:100px; text-align:center; @@ -62,6 +90,10 @@ margin-top:5px; } +.font-12 { + font-size: 12px; +} + .cash-color{ background-color:#80CBC4; } @@ -84,6 +116,12 @@ margin-bottom: 5px; } +.radius-btn { + border-radius:5px; + color:#fff; + background-color:red; +} + .bottom-5 { margin-bottom: 5px; } @@ -186,16 +224,6 @@ margin-bottom: 1px; } -/*----- Reset -----*/ - -select.form-control { - height: inherit !important; -} - -.form-horizontal .form-group { - margin-right: 0px !important; -} - /* Discount */ .discount-item-row { @@ -248,7 +276,6 @@ tr.discount-item-row:hover { /*Loading gif for payment*/ #loading_wrapper{ - position: fixed; background-color: #C8C8C8 ; height: 100%; @@ -258,6 +285,7 @@ tr.discount-item-row:hover { top: 0; z-index: 9999999; } + #loading{ position: relative; height: 100%; diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index e17a0f93..cd7a48af 100644 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -46,23 +46,27 @@ ul.dropdown-menu li a{ width: 100%; } - .footer-header { - color : #ef404a; - font-weight:bold; - font-style:italic; - margin-bottom:0px; - } +.footer-header { + color : #ef404a; + font-weight:bold; + font-style:italic; + margin-bottom:0px; +} - .menu-item-img { +.menu-item-img { margin: 10px; text-align: center; - } +} - .padding-10 { +.padding-10 { padding: 10px; - } +} /* Colors */ +.white { + color: #fff; +} + .purple { background-color:#7a62d3; } @@ -79,7 +83,7 @@ ul.dropdown-menu li a{ background-color: #009900; } -.orange{ +.yellow { background-color: #FF8C00; } @@ -87,4 +91,110 @@ ul.dropdown-menu li a{ background-color: blue; } -/* End Colors */ \ No newline at end of file +/* End Colors */ + +.pin_pad { + width: 33%; + height: 70px; + line-height: 70px; + text-align: center; + background: #54A5AF; + font-size: 20px; + color: white; +} + +.bottom { + margin-bottom: 1px; +} + +.left { + margin-left: 1px; +} + +.card { + margin-top: 10px; + box-sizing: border-box; + border-radius: 2px; + background-clip: padding-box; + transition: 0.3s ease; + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); +} + +.card-footer { + padding: 0; + background-color: #fff; + border-top: none; +} + +.dashboard-nav { + cursor: pointer; + color: #7a62d3; + padding: 10px; + font-size: 24px; + font-weight: bold; + border-radius: 0 0 2px 2px; + background-clip: padding-box; + box-sizing: border-box; + transition: color 0.3s ease; + text-align: center; +} + +.card:hover { + box-shadow: 0 10px 20px 0 rgba(0, 0, 0, 0.16), 0 10px 20px 0 rgba(0, 0, 0, 0.12); +} + +#admin ul { + line-height: 25px; +} + +.panel-body { + padding: 5px !important; +} + +.panel-title .glyphicon { + float: right; +} + +@media screen and (min-height: 800px){ + .card .card-content { + padding: 30px !important; + } +} + +@media screen and (min-height: 540px){ + .card .card-content { + padding: 20px !important; + } +} + +@media (min-width: 34em) { + .card-columns { + -webkit-column-count: 2; + -moz-column-count: 2; + column-count: 2; + } +} + +@media (min-width: 48em) { + .card-columns { + -webkit-column-count: 3; + -moz-column-count: 3; + column-count: 3; + } +} + +@media (min-width: 62em) { + .card-columns { + -webkit-column-count: 4; + -moz-column-count: 4; + column-count: 4; + } +} + +@media (min-width: 75em) { + .card-columns { + -webkit-column-count: 5; + -moz-column-count: 5; + column-count: 5; + } +} \ No newline at end of file diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index 8a922573..33f9fc2d 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -15,220 +15,192 @@ -
-
-
-
-
- OQS -
-
+
+
+

Role Features

+ +
+ <% if current_user.role == 'administrator' %> +
+
+

+ Administrator +

+
+
+
+
    +
  • All Settings
    • +
      +
    • Zone
      • +
    • OQS
      • +
    • Menu
      • +
    • Cashier Terminal
      • +
    • Payment
      • +
    • Merbership
      • +
    • Print
      • +
    • Employees
      • +
    • Accounts
      • +
    +
+
    +
  • Transactions
    • +
      +
    • Order
      • +
    • Sale
      • +
    • Credit Note
      • +

    +
  • Reports
    • +
      +
    • Daily Sale
      • +
    • Sale Item
      • +
    • Receipt
      • +
    • Shift Sale
      • +
    • Credit Sale
      • +
    • Void Sale
      • +
    +
+
    +
  • OQS

    • +
  • Cashier

    • +
  • CRM
    • +
+
+
+
+ <% elsif current_user.role == 'manager' %> +
+
+

+ Manager +

+
+
+
+
    +
  • All Settings
    • +
      +
    • Zone
      • +
    • OQS
      • +
    • Menu
      • +
    • Cashier Terminal
      • +
    • Print
      • +
    • Employees
      • +
    • Accounts
      • +
    +
+
    +
  • Transactions
    • +
      +
    • Order
      • +
    • Sale
      • +
    • Credit Note
      • +

    +
  • Reports
    • +
      +
    • Daily Sale
      • +
    • Sale Item
      • +
    • Receipt
      • +
    • Shift Sale
      • +
    • Credit Sale
      • +
    • Void Sale
      • +
    +
+
    +
  • OQS

    • +
  • Cashier

    • +
  • CRM
    • +
+
+
+
+ <% elsif current_user.role == 'supervisour' %> +
+
+

+ Supervisor +

+
+
+
+
    +
  • OQS
    • +
      +
    • Void
      • +
    • FOC
      • +
    • Edit
      • +
    • Credit
      • +
    • Payment
      • +
    +
+
+
+
+ <% elsif current_user.role == 'cashier' %> +
+
+

+ Cashier +

+
+
+
+
    +
  • Cashier Panel except Edit and Void
    • +
  • Sale and Order
    • +
  • and Queue in CRM
    • +
+
+
+
+ <% elsif current_user.role == 'account' %> +
+
+

+ Accountant +

+
+
+
+
    +
  • Daily Sale Report
    • +
  • Sale Item Report
    • +
  • Receipt No Report
    • +
  • ShiftSale Report
    • +
+
+
+
+ <% end %>
-
-
-
-
- Cashier -
+
+
+
OQS
+
+ +
+
Cashier
+
+ +
+
CRM
+
+ + + +
+
Inventory
- -
-
-
-
- CRM -
-
-
-
- -
-
-
-
- Backend -
-
-
-
- -
-
-
-
- Inventory -
-
-
-
-
-
-
-

Role Features

- -
- <% if current_user.role == 'administrator' %> -
-
-

- Administrator -

-
-
-
-
    -
  • All Settings
    • -
      -
    • Zone
      • -
    • OQS
      • -
    • Menu
      • -
    • Cashier Terminal
      • -
    • Payment
      • -
    • Merbership
      • -
    • Print
      • -
    • Employees
      • -
    • Accounts
      • -
    -
-
    -
  • Transactions
    • -
      -
    • Order
      • -
    • Sale
      • -
    • Credit Note
      • -

    -
  • Reports
    • -
      -
    • Daily Sale
      • -
    • Sale Item
      • -
    • Receipt
      • -
    • Shift Sale
      • -
    • Credit Sale
      • -
    • Void Sale
      • -
    -
-
    -
  • OQS

    • -
  • Cashier

    • -
  • CRM
    • -
-
-
-
- <% elsif current_user.role == 'manager' %> -
-
-

- Manager -

-
-
-
-
    -
  • All Settings
    • -
      -
    • Zone
      • -
    • OQS
      • -
    • Menu
      • -
    • Cashier Terminal
      • -
    • Print
      • -
    • Employees
      • -
    • Accounts
      • -
    -
-
    -
  • Transactions
    • -
      -
    • Order
      • -
    • Sale
      • -
    • Credit Note
      • -

    -
  • Reports
    • -
      -
    • Daily Sale
      • -
    • Sale Item
      • -
    • Receipt
      • -
    • Shift Sale
      • -
    • Credit Sale
      • -
    • Void Sale
      • -
    -
-
    -
  • OQS

    • -
  • Cashier

    • -
  • CRM
    • -
-
-
-
- <% elsif current_user.role == 'supervisour' %> -
-
-

- Supervisor -

-
-
-
-
    -
  • OQS
    • -
      -
    • Void
      • -
    • FOC
      • -
    • Edit
      • -
    • Credit
      • -
    • Payment
      • -
    -
-
-
-
- <% elsif current_user.role == 'cashier' %> -
-
-

- Cashier -

-
-
-
-
    -
  • Cashier Panel except Edit and Void
    • -
  • Sale and Order
    • -
  • and Queue in CRM
    • -
-
-
-
- <% elsif current_user.role == 'account' %> -
-
-

- Accountant -

-
-
-
-
    -
  • Daily Sale Report
    • -
  • Sale Item Report
    • -
  • Receipt No Report
    • -
  • ShiftSale Report
    • -
-
-
-
- <% end %> -
-
-
-
@@ -244,44 +216,3 @@
- - diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 2a1d9fd3..83d43ea8 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -29,7 +29,7 @@ <% @employees.each do |employee| %> -
+

@@ -48,8 +48,8 @@

-
-

Role Features

+
+

Role Features

@@ -141,52 +141,6 @@
- diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index ba7bf989..378bcbe3 100644 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -17,7 +17,7 @@

Date: <%=@sale_data.receipt_date.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%>

-
+
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 2742f249..4cdcf01d 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -21,13 +21,13 @@
-
-
+
+
<% @complete.each do |sale| %>
<%= sale.receipt_no %> - <%= sale.sale_status %> + <%= sale.sale_status %>
<% end %> @@ -35,8 +35,8 @@
-
-
+
+
<% @tables.each do |table| %> <% if table.status == 'occupied' %> <% if table.get_booking.nil? %> @@ -67,8 +67,8 @@
-
-
+
+
<% @rooms.each do |room| %> <% if room.status == 'occupied' %>
@@ -88,8 +88,8 @@
-
-
+
+
<% @orders.each do |order| %>
@@ -104,13 +104,12 @@
- + - - + <%if current_login_employee.role == "administrator" || current_login_employee.role == "manager" %>
@@ -251,10 +249,9 @@ <% end %> - +
-
<% if @status_sale == 'sale' @@ -314,7 +311,7 @@
- + <% if @dining.bookings.length >= 1 %> <% if @status_order == 'order' && @status_sale != 'sale' %> diff --git a/app/views/origami/in_juties/_assign_in_juty.html.erb b/app/views/origami/in_juties/_assign_in_juty.html.erb index 62531529..84e1e629 100644 --- a/app/views/origami/in_juties/_assign_in_juty.html.erb +++ b/app/views/origami/in_juties/_assign_in_juty.html.erb @@ -26,6 +26,8 @@ <%= f.button :submit, "Create", :class => 'btn btn-primary ', :id => 'create' %> <%= f.button :submit, "Update", :class => 'btn btn-primary ', :disabled => '', :id => 'update' %> <%= f.button :button, "Reset", :class => 'btn btn-danger ', :id => 'reset' %> + +
<% end %> diff --git a/app/views/origami/in_juties/index_in_juty.html.erb b/app/views/origami/in_juties/index_in_juty.html.erb index bbb9912b..c9247acd 100644 --- a/app/views/origami/in_juties/index_in_juty.html.erb +++ b/app/views/origami/in_juties/index_in_juty.html.erb @@ -35,10 +35,6 @@
-
- -
-