comee_core 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbd554c8a5918b912f0d9b2fee535998739a2b7a39192db601992be00fd8d8a8
-  data.tar.gz: 24693f3a557171aea57c69f95614cc08b59a4b2882c98720d8d028eedc6ba3b9
+  metadata.gz: 79192d2994ff3a9aa6f58ed0369421fdf38d7a089dd28a8d88b05664634ad2df
+  data.tar.gz: 59bc3b2bb2c636132602985e5bc165ee17866809522e3137d5dd8c9433972d80
 SHA512:
-  metadata.gz: cdee0e54cf1f7d7c8ffc5bdba61b980a5548b3f32f240dfd766236f5364e746b7799132826cdbc3d5232f05a810321585cbe0c4f791b60d32fccf7712eef57eb
-  data.tar.gz: 439c3a1a44b8da1f87485e4892bd6bf1ebf18cd42508616d1f78f48054d2dc4ed30d5ce1f852b8449f7ec0ac76313302ef8fc0d4c97bf005c0af5be8cb30e39f
+  metadata.gz: 8820af598fd97f4d0755ac480ee05a7c728c954bc316c1e43ddd9db5023233f595836a7181fdf37aed885de0d94869816fc2c0cd7facfd483bddf0b90d4f3ac7
+  data.tar.gz: 6e9b291a3c46742340f05adb192264855291fd3cf39f8ca581d40f1f8e9f66078e485e1e05101a3c5122e551d6cc64e57c83b5f683e5cd83917d059cb2a51382

data/app/models/comee/core/client_price.rb

@@ -8,7 +8,7 @@ module Comee
 
       validates :valid_from, :valid_to, :price, :status, presence: true
       validates :price, numericality: {greater_than: 0}
-      validates :product_id, uniqueness: {scope: :client_id}
+      validates :product_id, uniqueness: {scope: [:client_id, :previous_price_id]}
       validate :validate_price_validity_dates
 
       def validate_price_validity_dates
@@ -19,7 +19,7 @@ module Comee
       end
 
       def self.ransackable_attributes(auth_object = nil)
-        ["valid_from", "valid_to", "new_price", "old_price", "product_id", "client_id"]
+        ["valid_from", "valid_to", "price", "status", "product_id", "client_id", "previous_price_id"]
       end
 
       def self.ransackable_associations(auth_object = nil)

data/app/models/comee/core/master_price.rb

@@ -7,7 +7,7 @@ module Comee
 
       validates :purchase_price, :selling_price, :pp_valid_from, :pp_valid_to, :sp_valid_from, :sp_valid_to, presence: true
       validates :margin, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
-      validates :product_id, uniqueness: {scope: :supplier_id}
+      validates :product_id, uniqueness: {scope: [:supplier_id, :previous_price_id]}
       validate :validate_primary_price, :validate_purchase_price_validity_dates, :validate_selling_price_validity_dates
 
       def validate_primary_price

data/app/models/comee/core/sales_order.rb

@@ -4,7 +4,7 @@ module Comee
       belongs_to :client
       has_many :sales_order_items
 
-      enum :status, {draft: 0, confirmed: 1}
+      enum :status, {draft: 0, confirmed: 1, cancelled: 2}
 
       validates :order_number, presence: true, uniqueness: true
       validates :order_date, :expected_delivery_date, :delivery_address, :invoice_address, :status, presence: true
@@ -16,6 +16,20 @@ module Comee
 
       delegate(:name, to: :client, prefix: true)
 
+      def confirm
+        raise(StandardError, "Sales order is already confirmed.") if SalesOrder.statuses[status] == SalesOrder.statuses[:confirmed]
+
+        self.status = SalesOrder.statuses[:confirmed]
+        save
+      end
+
+      def cancel
+        raise(StandardError, "Sales order is already cancelled.") if SalesOrder.statuses[status] == SalesOrder.statuses[:cancelled]
+
+        self.status = SalesOrder.statuses[:cancelled]
+        save
+      end
+
       def self.ransackable_attributes(auth_object = nil)
         [
           "delivery_address",

data/db/migrate/20230813235946_create_comee_core_master_prices.rb

@@ -25,6 +25,9 @@ class CreateComeeCoreMasterPrices < ActiveRecord::Migration[7.0]
 
       t.timestamps
     end
-    add_index :comee_core_master_prices, [:product_id, :supplier_id], unique: true
+    add_index :comee_core_master_prices,
+      [:product_id, :supplier_id, :previous_price_id],
+      unique: true,
+      name: "pi_si_ppi_on_ccmp_indx"
   end
 end

data/db/migrate/20230814151601_create_comee_core_client_prices.rb

@@ -20,6 +20,9 @@ class CreateComeeCoreClientPrices < ActiveRecord::Migration[7.0]
 
       t.timestamps
     end
-    add_index :comee_core_client_prices, [:product_id, :client_id], unique: true
+    add_index :comee_core_client_prices,
+      [:product_id, :client_id, :previous_price_id],
+      unique: true,
+      name: "pi_ci_ppi_on_cccp_indx"
   end
 end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.14"
+    VERSION = "0.1.16"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers