From dd08fd429833746ba20020b488657e04c4f87976 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 23 Oct 2017 17:28:48 +0630 Subject: [PATCH 1/3] update addorder button and plus icon etcc.. --- app/assets/javascripts/addorder.js | 36 ++++++++++----------- app/assets/stylesheets/addorder.scss | 7 ++-- app/views/origami/addorders/detail.html.erb | 18 +++++------ 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index a2d77325..c8bb6be3 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -37,8 +37,8 @@ $(function(){ } row = '
' - +'
' - +''+ product[field].name +'' + +'
' + +'
'+ product[field].name +'
' +"
" - +"' - +'' + +"" + +'add' +'
' +'
' @@ -65,7 +64,7 @@ $(function(){ +"
" +'
' - +''+ product[field].unit_price +'' + +''+ product[field].unit_price +'' +'
' +'
'; $('.menu_items_list').append(row); @@ -109,6 +108,7 @@ $(function(){ if (JSON.stringify(menu_items[field].item_sets)!='[]') { fa_plus = ''; + add = ''; menu_item_box = 'set_item_box'; data_target = 'sx_item_set_detailModal'; @@ -120,7 +120,8 @@ $(function(){ item_attributes = menu_items[field].attributes; promotion_price = menu_items[field].promotion_price; }else{ - fa_plus = 'fa-plus'; + fa_plus = 'material-icons'; + add = 'add' menu_item_box = 'menu_item_box'; data_target = 'sx_item_detailModal'; @@ -146,8 +147,8 @@ $(function(){ } row = '
' - +'
' - +''+ menu_items[field].name +'' + +'
' + +'
'+ menu_items[field].name +'
' +"
" - +"' - +'' + +"" + +add+ '' +'
' +'
' @@ -174,7 +174,7 @@ $(function(){ +"
" +'
' - +''+ price +'' + +''+ price +'' +'
' +'
'; $('.menu_items_list').append(row); @@ -216,14 +216,14 @@ $(function(){ +"' data-max-qty='"+item_sets[field]["max_selectable_qty"] +"'>" +'
' - +''+result["name"]+'' + +''+result["name"]+'' +'
' +'
' +'' +' ' +'
' +'
' - +' '+result["price"]+'' + +' '+result["price"]+'' // +' ' +'
' +'' @@ -433,8 +433,8 @@ $(function(){ disabled = "disabled"; } row +=""; }); @@ -446,7 +446,7 @@ $(function(){ type = item_options[field]["type"]; row = "

"+type+"

" $(value).each(function(i){ - row +=""; }); $(".options-list").append(row); diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index 7d3add13..91976f41 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -1,3 +1,6 @@ +section .content{ + padding:50px 15px 0 225px !important; +} .custom-card-head{ height: 40px; background-color: #54A5AF; @@ -78,11 +81,9 @@ element.style { } .selected-attribute { - color: #fff !important; background-color: green !important; } .selected-option { - color: #fff !important; background-color: green !important; } @@ -94,12 +95,14 @@ element.style { white-space: normal !important; margin-bottom: 5px; margin-right: 5px; + color:#111 !important; } .option_btn { white-space: normal !important; margin-bottom: 5px; margin-right: 5px; + color:#111 !important; } #logo{ margin: auto; diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 078d10f4..1056d477 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -23,8 +23,7 @@
- -

+
ORDER DETAILS | Table <%=@table.name%> @@ -121,13 +120,14 @@
@@ -154,8 +154,8 @@

Total :

- - + +
@@ -183,13 +183,13 @@
@@ -207,7 +207,7 @@
-
+
From 17926742d51e3c6c16e4fce53f0bb06c9f3ba20c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 23 Oct 2017 17:40:02 +0630 Subject: [PATCH 2/3] update twice scroll etcc.. --- app/assets/stylesheets/origami.scss | 6 ------ app/views/crm/customers/index.html.erb | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index d0819198..9c2dcbb1 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -39,12 +39,6 @@ select.form-control { /* End Reset */ -.dining { - min-height:470px; - max-height:570px; - overflow:auto -} - .order-info { min-height:300px; max-height:500px; diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index b74f33a9..c14ec832 100755 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -1,4 +1,4 @@ -
+
  • Home
    • @@ -9,7 +9,7 @@
-
+
From e1dc1d4a8a88216c3958629b5276080b0202814a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 23 Oct 2017 18:11:43 +0630 Subject: [PATCH 3/3] update orgamidesign etcc.. --- app/assets/javascripts/origami.js | 1 + app/assets/stylesheets/origami.scss | 8 ++++---- app/views/origami/addorders/detail.html.erb | 3 +++ app/views/origami/credit_payments/index.html.erb | 6 +++--- app/views/origami/discounts/index.html.erb | 5 +++++ app/views/origami/jcb/index.html.erb | 6 +++--- app/views/origami/master/index.html.erb | 6 +++--- app/views/origami/mpu/index.html.erb | 6 +++--- app/views/origami/payments/show.html.erb | 2 +- app/views/origami/sales/show.html.erb | 16 ++++++++-------- app/views/origami/visa/index.html.erb | 6 +++--- 11 files changed, 37 insertions(+), 28 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 2f9fcee4..c799c0be 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -4,6 +4,7 @@ //= require bootstrap/js/bootstrap-material-design.min //= require jquery_ujs //= require turbolinks +//= require cable //= require jquery-slimscroll/jquery.slimscroll.js //= require node-waves/waves.js //= require sweetalert/sweetalert.min.js diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 9c2dcbb1..6e06b1e5 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -97,15 +97,15 @@ select.form-control { } .cash-color{ - background-color:#80CBC4; + background-color:#2196F3; } .credit-color{ - background-color:#FFCCBC; + background-color:#FF5722; } .other-payment-color{ - background-color:#E1BEE7; + background-color:#795548; } .cashier_number:hover{ @@ -201,7 +201,7 @@ select.form-control { } .red { - background-color:#ff0000; + background-color:#F44336; } .green{ diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 1056d477..be16da51 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -1,5 +1,8 @@ <%= stylesheet_link_tag 'addorder', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'addorder', 'data-turbolinks-track': 'reload' %> +
    diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb index d8f5a263..2d246ce4 100755 --- a/app/views/origami/credit_payments/index.html.erb +++ b/app/views/origami/credit_payments/index.html.erb @@ -90,11 +90,11 @@
-
1000
+
1000
3000
-
5000
+
5000
10000
@@ -106,7 +106,7 @@
- +
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index ada238bb..4fbaff3f 100755 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -1,4 +1,7 @@
+
@@ -366,6 +369,7 @@ // Pay Discount for Payment $("#pay-discount").on('click', function(e){ e.preventDefault(); + $("#loading_wrapper").show(); var sale_id = $('#sale-id').text(); var discount_items = JSON.stringify(get_discount_item_rows()); var overall_discount = $("#order-discount").text(); @@ -379,6 +383,7 @@ url: ajax_url, data: params, success:function(result){ + $("#loading_wrapper").hide(); swal({ title: "Infomation!", text: result.status, diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb index e1ec43d4..c27013d2 100755 --- a/app/views/origami/jcb/index.html.erb +++ b/app/views/origami/jcb/index.html.erb @@ -76,11 +76,11 @@
-
1000
+
1000
3000
-
5000
+
5000
10000
@@ -92,7 +92,7 @@
- +
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb index bdbbf6d4..b817effd 100755 --- a/app/views/origami/master/index.html.erb +++ b/app/views/origami/master/index.html.erb @@ -76,11 +76,11 @@
-
1000
+
1000
3000
-
5000
+
5000
10000
@@ -92,7 +92,7 @@
- +
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb index ce2947fd..92a87dd2 100755 --- a/app/views/origami/mpu/index.html.erb +++ b/app/views/origami/mpu/index.html.erb @@ -79,11 +79,11 @@
-
1000
+
1000
3000
-
5000
+
5000
10000
@@ -95,7 +95,7 @@
- +
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index af8cde00..0cd18f0f 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -265,7 +265,7 @@ - +
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index 2152deb1..904d5896 100755 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -25,7 +25,7 @@
<% @complete.each do |sale| %> -
+
<%= sale.receipt_no %><%= sale.sale_status %>
@@ -39,7 +39,7 @@
<% @tables.each do |table| %> <% if table.status == 'occupied' %> -
+
<%= table.name %> <% if table.get_booking.nil? %> @@ -50,7 +50,7 @@
<% else %> -
+
<%= table.name %>
@@ -65,7 +65,7 @@
<% @rooms.each do |room| %> <% if room.status == 'occupied' %> -
+
<%= room.name %> <% if room.get_booking.nil? %> @@ -76,7 +76,7 @@
<% else %> -
+
<%= room.name %>
@@ -90,7 +90,7 @@
<% @orders.each do |order| %> -
+
<%= order.order_id %>
@@ -198,9 +198,9 @@
<% if @sale.sale_status != 'void' %> - + <% end %> - +
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb index 53cf8dcf..53589c89 100755 --- a/app/views/origami/visa/index.html.erb +++ b/app/views/origami/visa/index.html.erb @@ -76,11 +76,11 @@
-
1000
+
1000
3000
-
5000
+
5000
10000
@@ -92,7 +92,7 @@
- +