From 61166d615d17d563836314ba588a8307858e60bc Mon Sep 17 00:00:00 2001 From: Zoey Date: Tue, 18 Jun 2019 13:35:15 +0630 Subject: [PATCH] seed generator --- app/models/assigned_order_item.rb | 7 ++++++- app/models/booking.rb | 11 ++++++++--- app/models/cashier_login_log.rb | 9 +++++++-- app/models/commission.rb | 7 ++++++- app/models/customer.rb | 7 ++++++- app/models/order.rb | 12 +++++++++++- app/models/order_item.rb | 7 ++++++- app/models/order_reservation.rb | 6 +++++- app/models/order_reservation_item.rb | 7 ++++++- app/models/reservation.rb | 7 ++++++- app/models/reservation_item.rb | 11 ++++++++--- app/models/sale.rb | 7 ++++++- app/models/sale_audit.rb | 7 ++++++- app/models/sale_item.rb | 7 ++++++- app/models/sale_order.rb | 7 ++++++- app/models/sale_payment.rb | 7 ++++++- app/models/sale_tax.rb | 7 ++++++- app/models/seed_generator.rb | 21 +++++++++++++++++---- app/views/origami/home/index.html.erb | 20 ++++++++++---------- config/secrets.yml | 2 +- dump.rdb | Bin 1214654 -> 1214655 bytes 21 files changed, 139 insertions(+), 37 deletions(-) diff --git a/app/models/assigned_order_item.rb b/app/models/assigned_order_item.rb index 8f1d0694..9ec5797a 100755 --- a/app/models/assigned_order_item.rb +++ b/app/models/assigned_order_item.rb @@ -62,6 +62,11 @@ class AssignedOrderItem < ApplicationRecord private def generate_custom_id - self.assigned_order_item_id = SeedGenerator.generate_id(self.class.name, "AOI") + prefix = "AOI" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CAOI" + end + + self.assigned_order_item_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/booking.rb b/app/models/booking.rb index 01684ab2..2546a332 100755 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -18,7 +18,7 @@ class Booking < ApplicationRecord booking = TableBooking.new booking.booking_id = b['booking_id'] booking.dining_facility_id = b['dining_facility_id'] - booking.type = b['type'] + # booking.type = b['type'] booking.checkin_at = b['checkin_at'] booking.checkin_by = b['checkin_by'] booking.checkout_at = b['checkout_at'] @@ -97,7 +97,7 @@ class Booking < ApplicationRecord .joins('left join sale_orders on sale_orders.order_id=assigned_order_items.order_id') .where('sale_orders.sale_id=?', sale_id) - @bookings = Booking.where('sale_id=?', sale_id) + @bookings = TableBooking.where('sale_id=?', sale_id) @sales = Sale.where("sale_id=?", sale_id) @@ -120,6 +120,11 @@ class Booking < ApplicationRecord private def generate_custom_id - self.booking_id = SeedGenerator.generate_id(self.class.name, "BKI") + prefix = "BKI" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CBKI" + end + + self.booking_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/cashier_login_log.rb b/app/models/cashier_login_log.rb index 353e9c90..4db670e6 100755 --- a/app/models/cashier_login_log.rb +++ b/app/models/cashier_login_log.rb @@ -6,6 +6,11 @@ class CashierLoginLog < ApplicationRecord private def generate_custom_id - self.cashier_login_log_id = SeedGenerator.generate_id(self.class.name, "CLO") + prefix = "CLO" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CCLO" + end + + self.cashier_login_log_id = SeedGenerator.generate_id(self.class.name, prefix) end -end +end \ No newline at end of file diff --git a/app/models/commission.rb b/app/models/commission.rb index 32aa8a04..483ed75c 100755 --- a/app/models/commission.rb +++ b/app/models/commission.rb @@ -13,6 +13,11 @@ class Commission < ApplicationRecord scope :active, -> {where(is_active: true)} private def generate_custom_id - self.commission_id = SeedGenerator.generate_id(self.class.name, 'COM') + prefix = "COM" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CCOM" + end + + self.commission_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/customer.rb b/app/models/customer.rb index d69220f3..098e512f 100755 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -365,6 +365,11 @@ class Customer < ApplicationRecord private def generate_custom_id - self.customer_id = SeedGenerator.generate_id(self.class.name, "CUS") + prefix = "CUS" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CCUS" + end + + self.customer_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/order.rb b/app/models/order.rb index 44dc3668..36c64984 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -550,10 +550,20 @@ class Order < ApplicationRecord return false end + def self.env + return ENV["SERVER_MODE"] + end + private def generate_custom_id - self.order_id = SeedGenerator.generate_id(self.class.name, "ODR") + + prefix = "ODR" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CODR" + end + + self.order_id = SeedGenerator.generate_id(self.class.name, prefix) end def set_order_date diff --git a/app/models/order_item.rb b/app/models/order_item.rb index c4c9067a..a64f15dd 100755 --- a/app/models/order_item.rb +++ b/app/models/order_item.rb @@ -95,6 +95,11 @@ class OrderItem < ApplicationRecord private def generate_custom_id - self.order_items_id = SeedGenerator.generate_id(self.class.name, "ODI") + prefix = "ODI" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CODI" + end + + self.order_items_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index c75ad748..c10325d5 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -519,6 +519,10 @@ class OrderReservation < ApplicationRecord private def generate_custom_id - self.order_reservation_id = SeedGenerator.generate_id(self.class.name, "ODRS") + prefix = "ODRS" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CODRS" + end + self.order_reservation_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/order_reservation_item.rb b/app/models/order_reservation_item.rb index 0d932f92..d819166f 100644 --- a/app/models/order_reservation_item.rb +++ b/app/models/order_reservation_item.rb @@ -27,6 +27,11 @@ class OrderReservationItem < ApplicationRecord private def generate_custom_id - self.order_reservation_items_id = SeedGenerator.generate_id(self.class.name, "ODRSI") + prefix = "ODRSI" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CODRSI" + end + + self.order_reservation_items_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/reservation.rb b/app/models/reservation.rb index 4e5ff37a..919b269a 100644 --- a/app/models/reservation.rb +++ b/app/models/reservation.rb @@ -10,6 +10,11 @@ class Reservation < ApplicationRecord private def generate_custom_id - self.order_reservation_id = SeedGenerator.generate_id(self.class.name, "RS") + prefix = "RS" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CRS" + end + + self.order_reservation_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/reservation_item.rb b/app/models/reservation_item.rb index 19e28b82..7895da33 100644 --- a/app/models/reservation_item.rb +++ b/app/models/reservation_item.rb @@ -7,7 +7,12 @@ class ReservationItem < ApplicationRecord belongs_to :reservation, autosave: true private - def generate_custom_id - self.reservation_items_id = SeedGenerator.generate_id(self.class.name, "RSI") - end + def generate_custom_id + prefix = "RSI" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CRSI" + end + + self.reservation_items_id = SeedGenerator.generate_id(self.class.name, prefix) + end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 3512e827..217fba4a 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -2759,6 +2759,11 @@ end private def generate_custom_id - self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL") + prefix = "SAL" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CSAL" + end + + self.sale_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/sale_audit.rb b/app/models/sale_audit.rb index ef31085e..f22896a7 100755 --- a/app/models/sale_audit.rb +++ b/app/models/sale_audit.rb @@ -174,6 +174,11 @@ class SaleAudit < ApplicationRecord private def generate_custom_id - self.sale_audit_id = SeedGenerator.generate_id(self.class.name, "SAI") + prefix = "SAI" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CSAI" + end + + self.sale_audit_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index 5cb3f4e6..b0154fbf 100755 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -221,6 +221,11 @@ class SaleItem < ApplicationRecord private def generate_custom_id - self.sale_item_id = SeedGenerator.generate_id(self.class.name, "SLI") + prefix = "SLI" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CSLI" + end + + self.sale_item_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/sale_order.rb b/app/models/sale_order.rb index 03a2926a..ab569fd4 100755 --- a/app/models/sale_order.rb +++ b/app/models/sale_order.rb @@ -31,8 +31,13 @@ class SaleOrder < ApplicationRecord private def generate_sale_order_id + prefix = "SOI" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CSOI" + end + self.class.name - saleOrderId = SeedGenerator.generate_id(self.class.name, "SOI") + saleOrderId = SeedGenerator.generate_id(self.class.name, prefix) self.sale_order_id = saleOrderId end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index e3ba3379..167d64ef 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -993,6 +993,11 @@ class SalePayment < ApplicationRecord private def generate_custom_id - self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI") + prefix = "SPI" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CSPI" + end + + self.sale_payment_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/sale_tax.rb b/app/models/sale_tax.rb index 37159364..a61a3dee 100755 --- a/app/models/sale_tax.rb +++ b/app/models/sale_tax.rb @@ -32,6 +32,11 @@ class SaleTax < ApplicationRecord private def generate_custom_id - self.sale_tax_id = SeedGenerator.generate_id(self.class.name, "STI") + prefix = "STI" + if ENV["SERVER_MODE"] == 'cloud' + prefix = "CSTI" + end + + self.sale_tax_id = SeedGenerator.generate_id(self.class.name, prefix) end end diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 44160834..4ecd932d 100755 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -1,15 +1,17 @@ class SeedGenerator < ApplicationRecord # Generate ID for Tables def self.generate_id(model, prefix) - cur_val, next_val = self.update_seed(model) + model_name = self.get_model_name(model) + + cur_val, next_val = self.update_seed(model_name) if (cur_val == 0) - cur_val, next_val = self.execute_query(model) - end + cur_val, next_val = self.execute_query(model_name) + end padding_len = 15 - prefix.length saleOrderId = prefix +"-"+ cur_val.to_s.to_s.rjust((14-prefix.length)+1,'0') - return saleOrderId + return saleOrderId end # Generate Receipt No for number order (1,2,3) Don't touch @@ -66,6 +68,17 @@ class SeedGenerator < ApplicationRecord # return next_code # end + def self.get_model_name(model) + model_name = "" + if ENV["SERVER_MODE"] == 'cloud' + model_name = "Cloud#{model}" + else + model_name = model + end + + return model_name + end + def self.execute_query(model) current = 0 nex = 0 diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index f508e4f3..7cc0899e 100755 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -47,16 +47,16 @@ <% @tables.each do |table| %> <% if table.status == 'occupied' %> <% if table.get_booking.nil? %> - <% if table.get_checkout_booking.nil? %> -
- <% else %> -
- <% end %> -
- Table <%= table.name %> ( <%= table.seater %> Seat )
- <%= table.zone.name %> -
-
+ <% if table.get_checkout_booking.nil? %> +
+ <% else %> +
+ <% end %> +
+ Table <%= table.name %> ( <%= table.seater %> Seat )
+ <%= table.zone.name %> +
+
<% else %> <% if table.get_checkout_booking.nil? %>
diff --git a/config/secrets.yml b/config/secrets.yml index 40e0906e..689e79fe 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -13,7 +13,7 @@ development: secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api - server_mode: application + server_mode: cloud cipher_type: AES-256-CBC sx_key: Wh@t1$C2L diff --git a/dump.rdb b/dump.rdb index 683785167f2825382f94a08ec8bc49f667fd48bb..e903798e4b40f394d793cda2ef381b90b659e350 100644 GIT binary patch delta 159 zcmdlt(QE%iuL*`iAI+Fze{qx+r>5xUrsf`M5VdJ^ZgpmCb!KXHW^Q$6X?138b!KaI zW^Z-oXm#dnb>?by=5BT7X?5mpb>?ez=5KWtXmu9c>MX?7$~+}<`SgHRp|8S1hNfl) zCPrpPhQ@k^=7tsqCMMg%+k~7LS&hAA*e6U+Y!?!rzO`Mb1;U>gFEu@)Lnw|T-z#-i IS@OwW05gy>^Z)<= delta 148 zcmdl#(QDsCuL*`icT|~Te{qx+r>5xUrsf{vD0gjiZgpmCb!KXHW^Q$6X?138b!KaI zW^Z-oXm#dnb>?by=5BT7X?5mpb>?ez=5KWtXmu9c>MX?7%Dm=8%JhI%p|3)MhNfl) xCPs!9rUrWE1_s8a7TY7*gq#>ze0JSrn?A2yXbyyB*CABNk@w(d^-(d`Rsc}iF`WPa