comee_core 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cf7c91a847172c08d9e35c46340095ff403ffb61939a5a7b69f830fa2394228
-  data.tar.gz: 55174a1b2a8a304b3ee99995b98efdd52557889b5d57b3623e016df11a29e34a
+  metadata.gz: 369ec987be59ed7d3d293ebfd5c22f6d5062ac3b7c596ab27eef192b37c3db2c
+  data.tar.gz: cf4ec8c1046d2a1a5fe5f6942c0a3819466c888e3df4052378dd499b1f772a09
 SHA512:
-  metadata.gz: b1b2f94a733c313e13ff4ad02c1a2189561d21beef7be6c9cf9089e5320950811b4ddaddf51e7c50e54eefd2918793b3b57b22d1978007df27fcbf8955fdea80
-  data.tar.gz: c6e916957bae4a9f6b29643c2f92e73d362e62b74a84610d0d2750b3e0465b3c8d1f4dba000d8d74d83d147fafc58a25dded8755eac92ba3e2b5139d75cd7c6c
+  metadata.gz: 77396dd2d028a8e020c9eef7379f5bf71fb08aa51a31a5c4bf58eaa062d967355b60787df5fa51838853454e250f891c472e771288034da43a886cd17543ebb7
+  data.tar.gz: d41a97d4f5aaca91b23ce28eefde249cf94a5e787300baf6da7b007a388b257e537e8e1f85df13e59b17f055c1fcdb45b16dcf1d511d45f2b9b0e338c266f0fb

data/app/controllers/comee/core/sales_orders_controller.rb

@@ -125,7 +125,7 @@ module Comee
                                         :client_id, :order_terms, :shipment_address, :delivery_address, :invoice_address,
                                         :destination, :handover_date, :shipping_date, :delivery_date, :consignee, :payment_term,
                                         :delivery_term, :payment_penalty, :status, :purchase_status, :total_price, :amount_paid,
-                                        :pallete_note, :remark, files: [])
+                                        :consolidator_date, :voyage_no, :shipping_arrangement, :pallete_note, :remark, files: [])
       end
 
       def back_order_params

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

@@ -1,14 +1,18 @@
 module Comee
   module Core
     class CustomerOrder < ApplicationRecord
+      OWN = "Own".freeze
+      AGENT = "Agent".freeze
+      SHIPPING_ARRANGEMENTS = [OWN, AGENT].freeze
+
       belongs_to :client
       has_many :customer_order_items
       has_one_attached :file
 
       enum :status, {draft: 0, submitted: 1, awaiting_confirmation: 2, accepted: 3, canceled: 4}
-      enum :shipping_arrangement, {own: 0, agent: 1}
 
       validates :order_number, :order_date, :delivery_address, :invoice_address, :status, presence: true
+      validates :shipping_arrangement, inclusion: {in: SHIPPING_ARRANGEMENTS}, allow_nil: true
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[id client_id delivery_address invoice_address order_number status final_destination consignee]

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

@@ -1,6 +1,10 @@
 module Comee
   module Core
     class SalesOrder < ApplicationRecord
+      OWN = "Own".freeze
+      AGENT = "Agent".freeze
+      SHIPPING_ARRANGEMENTS = [OWN, AGENT].freeze
+
       before_validation :generate_order_number, if: proc { |so| so.order_number.nil? }
 
       before_save :set_parent_client_name
@@ -15,12 +19,11 @@ module Comee
 
       enum :status, {draft: 0, submitted: 1, confirmed: 2, accepted: 3, canceled: 4}
       enum :purchase_status, {unprocessed: 0, processed: 1}
-      enum :shipping_arrangement, {own: 0, agent: 1}
 
       validates :order_number, presence: true, uniqueness: true
       validates :order_date, :status, :purchase_status, presence: true
       validates :payment_penalty, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}, allow_nil: true
-
+      validates :shipping_arrangement, inclusion: {in: SHIPPING_ARRANGEMENTS}, allow_nil: true
       validates :amount_paid,
                 presence: true,
                 numericality: {greater_than_or_equal_to: 0},

data/app/services/comee/core/customer_order_service.rb

@@ -219,7 +219,7 @@ module Comee
                 supplier_name: master_price.supplier.name,
                 supplier_item_no: product_lookup.code,
                 supplier_description: product_lookup.item_description,
-                country_of_origin: master_price.country_of_origin.name
+                country_of_origin: master_price&.country_of_origin&.name
               }
             }
           end

data/db/migrate/20240629065810_remove_address_field_from_supplier_and_client.rb

@@ -2,6 +2,6 @@ class RemoveAddressFieldFromSupplierAndClient < ActiveRecord::Migration[7.1]
   def change
     remove_column :comee_core_clients, :address, :string
     remove_column :comee_core_suppliers, :address, :string
-    remove_column :comee_core_clients, :shipment_addresses, array: true
+    remove_column :comee_core_clients, :shipment_addresses, :string, array: true
   end
 end

data/db/migrate/20240629135249_add_additional_fields_to_order.rb

@@ -4,7 +4,7 @@ class AddAdditionalFieldsToOrder < ActiveRecord::Migration[7.1]
     add_column :comee_core_sales_orders, :consolidator_date, :date
     add_column :comee_core_customer_orders, :voyage_no, :string
     add_column :comee_core_sales_orders, :voyage_no, :string
-    add_column :comee_core_customer_orders, :shipping_arrangement, :integer
-    add_column :comee_core_sales_orders, :shipping_arrangement, :integer
+    add_column :comee_core_customer_orders, :shipping_arrangement, :string
+    add_column :comee_core_sales_orders, :shipping_arrangement, :string
   end
 end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.7".freeze
+    VERSION = "0.3.9".freeze
   end
 end

data/spec/factories/comee/core/customer_orders.rb

@@ -15,6 +15,6 @@ FactoryBot.define do
     status { 0 }
     consolidator_date { Date.current }
     voyage_no { Faker::Alphanumeric.alpha(number: 10) }
-    shipping_arrangement { Comee::Core::CustomerOrder.shipping_arrangements[:own] }
+    shipping_arrangement { Comee::Core::CustomerOrder::OWN }
   end
 end

data/spec/factories/comee/core/sales_orders.rb

@@ -21,7 +21,7 @@ FactoryBot.define do
     status { Comee::Core::SalesOrder.statuses[:draft] }
     consolidator_date { Date.current }
     voyage_no { Faker::Alphanumeric.alpha(number: 10) }
-    shipping_arrangement { Comee::Core::SalesOrder.shipping_arrangements[:own] }
+    shipping_arrangement { Comee::Core::SalesOrder::OWN }
     purchase_status { Comee::Core::SalesOrder.purchase_statuses[:unprocessed] }
     total_price { 0 }
     amount_paid { 0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-30 00:00:00.000000000 Z
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers