From 9d95dc0f8e5d80860560f00dcc1195cbfc55397d Mon Sep 17 00:00:00 2001 From: Zoey Date: Fri, 21 Jun 2019 11:50:48 +0630 Subject: [PATCH] seed_generators prefix --- app/models/assigned_order_item.rb | 7 +------ app/models/booking.rb | 7 +------ app/models/cashier_login_log.rb | 7 +------ app/models/commission.rb | 7 +------ app/models/customer.rb | 7 +------ app/models/order.rb | 8 +------- 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 | 7 +------ app/models/sale.rb | 7 +------ app/models/sale_audit.rb | 7 +------ app/models/sale_item.rb | 7 +------ app/models/sale_payment.rb | 7 +------ app/models/sale_tax.rb | 7 +------ app/models/seed_generator.rb | 4 ++++ 17 files changed, 20 insertions(+), 96 deletions(-) diff --git a/app/models/assigned_order_item.rb b/app/models/assigned_order_item.rb index 6da815ab..1fd1e4a2 100755 --- a/app/models/assigned_order_item.rb +++ b/app/models/assigned_order_item.rb @@ -64,11 +64,6 @@ class AssignedOrderItem < ApplicationRecord private def generate_custom_id - prefix = "AOI" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CAOI" - end - - self.assigned_order_item_id = SeedGenerator.generate_id(self.class.name, prefix) + self.assigned_order_item_id = SeedGenerator.generate_id(self.class.name, "AOI") end end diff --git a/app/models/booking.rb b/app/models/booking.rb index e6f97a90..374dd0cf 100755 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -122,11 +122,6 @@ class Booking < ApplicationRecord private def generate_custom_id - prefix = "BKI" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CBKI" - end - - self.booking_id = SeedGenerator.generate_id(self.class.name, prefix) + self.booking_id = SeedGenerator.generate_id(self.class.name, "BKI") end end diff --git a/app/models/cashier_login_log.rb b/app/models/cashier_login_log.rb index 4db670e6..d8af4095 100755 --- a/app/models/cashier_login_log.rb +++ b/app/models/cashier_login_log.rb @@ -6,11 +6,6 @@ class CashierLoginLog < ApplicationRecord private def generate_custom_id - prefix = "CLO" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CCLO" - end - - self.cashier_login_log_id = SeedGenerator.generate_id(self.class.name, prefix) + self.cashier_login_log_id = SeedGenerator.generate_id(self.class.name, "CLO") end end \ No newline at end of file diff --git a/app/models/commission.rb b/app/models/commission.rb index 483ed75c..74a830a9 100755 --- a/app/models/commission.rb +++ b/app/models/commission.rb @@ -13,11 +13,6 @@ class Commission < ApplicationRecord scope :active, -> {where(is_active: true)} private def generate_custom_id - prefix = "COM" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CCOM" - end - - self.commission_id = SeedGenerator.generate_id(self.class.name, prefix) + self.commission_id = SeedGenerator.generate_id(self.class.name, "COM") end end diff --git a/app/models/customer.rb b/app/models/customer.rb index 098e512f..d69220f3 100755 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -365,11 +365,6 @@ class Customer < ApplicationRecord private def generate_custom_id - prefix = "CUS" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CCUS" - end - - self.customer_id = SeedGenerator.generate_id(self.class.name, prefix) + self.customer_id = SeedGenerator.generate_id(self.class.name, "CUS") end end diff --git a/app/models/order.rb b/app/models/order.rb index fd771fd6..7ffeb82b 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -557,13 +557,7 @@ class Order < ApplicationRecord private def generate_custom_id - - prefix = "ODR" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CODR" - end - - self.order_id = SeedGenerator.generate_id(self.class.name, prefix) + self.order_id = SeedGenerator.generate_id(self.class.name, "ODR") end def set_order_date diff --git a/app/models/order_item.rb b/app/models/order_item.rb index 88ec0843..ec8d00a7 100755 --- a/app/models/order_item.rb +++ b/app/models/order_item.rb @@ -97,11 +97,6 @@ class OrderItem < ApplicationRecord private def generate_custom_id - prefix = "ODI" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CODI" - end - - self.order_items_id = SeedGenerator.generate_id(self.class.name, prefix) + self.order_items_id = SeedGenerator.generate_id(self.class.name, "ODI") end end diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index c10325d5..c75ad748 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -519,10 +519,6 @@ class OrderReservation < ApplicationRecord private def generate_custom_id - prefix = "ODRS" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CODRS" - end - self.order_reservation_id = SeedGenerator.generate_id(self.class.name, prefix) + self.order_reservation_id = SeedGenerator.generate_id(self.class.name, "ODRS") end end diff --git a/app/models/order_reservation_item.rb b/app/models/order_reservation_item.rb index d819166f..0d932f92 100644 --- a/app/models/order_reservation_item.rb +++ b/app/models/order_reservation_item.rb @@ -27,11 +27,6 @@ class OrderReservationItem < ApplicationRecord private def generate_custom_id - prefix = "ODRSI" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CODRSI" - end - - self.order_reservation_items_id = SeedGenerator.generate_id(self.class.name, prefix) + self.order_reservation_items_id = SeedGenerator.generate_id(self.class.name, "ODRSI") end end diff --git a/app/models/reservation.rb b/app/models/reservation.rb index 919b269a..4e5ff37a 100644 --- a/app/models/reservation.rb +++ b/app/models/reservation.rb @@ -10,11 +10,6 @@ class Reservation < ApplicationRecord private def generate_custom_id - prefix = "RS" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CRS" - end - - self.order_reservation_id = SeedGenerator.generate_id(self.class.name, prefix) + self.order_reservation_id = SeedGenerator.generate_id(self.class.name, "RS") end end diff --git a/app/models/reservation_item.rb b/app/models/reservation_item.rb index 7895da33..6329f24e 100644 --- a/app/models/reservation_item.rb +++ b/app/models/reservation_item.rb @@ -8,11 +8,6 @@ class ReservationItem < ApplicationRecord private 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) + self.reservation_items_id = SeedGenerator.generate_id(self.class.name, "RSI") end end diff --git a/app/models/sale.rb b/app/models/sale.rb index c7a0e9d6..a00361aa 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -2790,11 +2790,6 @@ end private def generate_custom_id - prefix = "SAL" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CSAL" - end - - self.sale_id = SeedGenerator.generate_id(self.class.name, prefix) + self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL") end end diff --git a/app/models/sale_audit.rb b/app/models/sale_audit.rb index 4481abd8..471873e7 100755 --- a/app/models/sale_audit.rb +++ b/app/models/sale_audit.rb @@ -176,11 +176,6 @@ class SaleAudit < ApplicationRecord private def generate_custom_id - prefix = "SAI" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CSAI" - end - - self.sale_audit_id = SeedGenerator.generate_id(self.class.name, prefix) + self.sale_audit_id = SeedGenerator.generate_id(self.class.name, "SAI") end end diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index 3bd7ccd7..86e9cabc 100755 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -223,11 +223,6 @@ class SaleItem < ApplicationRecord private def generate_custom_id - prefix = "SLI" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CSLI" - end - - self.sale_item_id = SeedGenerator.generate_id(self.class.name, prefix) + self.sale_item_id = SeedGenerator.generate_id(self.class.name, "SLI") end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 6031282d..c0abed74 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -1004,11 +1004,6 @@ class SalePayment < ApplicationRecord private def generate_custom_id - prefix = "SPI" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CSPI" - end - - self.sale_payment_id = SeedGenerator.generate_id(self.class.name, prefix) + self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI") end end diff --git a/app/models/sale_tax.rb b/app/models/sale_tax.rb index 9ab75a09..44622c24 100755 --- a/app/models/sale_tax.rb +++ b/app/models/sale_tax.rb @@ -34,11 +34,6 @@ class SaleTax < ApplicationRecord private def generate_custom_id - prefix = "STI" - if ENV["SERVER_MODE"] == 'cloud' - prefix = "CSTI" - end - - self.sale_tax_id = SeedGenerator.generate_id(self.class.name, prefix) + self.sale_tax_id = SeedGenerator.generate_id(self.class.name, "STI") end end diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 5c699e27..94b7217e 100755 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -3,6 +3,10 @@ class SeedGenerator < ApplicationRecord def self.generate_id(model, prefix) model_name = self.get_model_name(model) + if ENV["SERVER_MODE"] == 'cloud' + prefix = "C#{prefix}" + end + cur_val, next_val = self.update_seed(model_name) if (cur_val == 0)