From 0813cb5722f6b5810d4c26b168e87072e95131d2 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 9 Nov 2017 12:01:22 +0630 Subject: [PATCH] update design pages --- app/assets/javascripts/addorder.js | 2 +- app/assets/stylesheets/origami.scss | 10 + app/views/origami/cash_ins/new.html.erb | 5 +- app/views/origami/cash_outs/new.html.erb | 2 +- app/views/origami/discounts/index.html.erb | 4 +- app/views/origami/home/show.html.erb | 2 +- app/views/origami/in_duties/index.html.erb | 2 +- .../origami/moveroom/move_dining.html.erb | 28 +- .../origami/movetable/move_dining.html.erb | 376 +++---- app/views/origami/orders/show.html.erb | 16 +- .../origami/other_charges/index.html.erb | 2 +- app/views/origami/payments/show.html.erb | 2 +- .../load_commissioners.html.erb | 4 +- app/views/origami/rooms/show.html.erb | 106 +- app/views/origami/sales/show.html.erb | 14 +- app/views/origami/shifts/show.html.erb | 2 +- .../origami/table_invoices/show.html.erb | 8 +- db/sym_master.sql | 972 ++++++++++-------- 18 files changed, 820 insertions(+), 737 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index cbcd662c..2804583a 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -664,7 +664,7 @@ $(function(){ success:function(result){ $("#loading_wrapper").hide(); swal({ - title: "Infomation !", + title: "Information !", text: 'Order has been successfully created', confirmButtonColor: "green", confirmButtonText: "Yes!", diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index b2cac2b3..8b269d92 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -104,6 +104,16 @@ select.form-control { color:white; } +.move_table{ + width: 100%; + height:74px; + line-height:74px; + text-align:center; + font-size:20px; + color:white; +} + + .payment{ height:50px; line-height:50px; diff --git a/app/views/origami/cash_ins/new.html.erb b/app/views/origami/cash_ins/new.html.erb index 990dce6d..bda159e2 100755 --- a/app/views/origami/cash_ins/new.html.erb +++ b/app/views/origami/cash_ins/new.html.erb @@ -45,8 +45,9 @@
-
- +
+
+
diff --git a/app/views/origami/cash_outs/new.html.erb b/app/views/origami/cash_outs/new.html.erb index e90337bf..66bffa51 100755 --- a/app/views/origami/cash_outs/new.html.erb +++ b/app/views/origami/cash_outs/new.html.erb @@ -19,7 +19,7 @@


- +
diff --git a/app/views/origami/discounts/index.html.erb b/app/views/origami/discounts/index.html.erb index 3a63c080..e1bcd3ee 100755 --- a/app/views/origami/discounts/index.html.erb +++ b/app/views/origami/discounts/index.html.erb @@ -21,7 +21,7 @@

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

-
+
@@ -209,7 +209,7 @@
- + diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 251ff21d..1d5c37d0 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -154,7 +154,7 @@
-
+
diff --git a/app/views/origami/in_duties/index.html.erb b/app/views/origami/in_duties/index.html.erb index 8af03f8b..19f707fa 100755 --- a/app/views/origami/in_duties/index.html.erb +++ b/app/views/origami/in_duties/index.html.erb @@ -40,7 +40,7 @@
- +