comee_core 0.1.85 → 0.1.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65a6f4cc76af66361e5d6d21999a8a38a0c2598f83980632783f7b1add6488ca
-  data.tar.gz: 554dc63474d64f44982cb4aea62040ab41f65c4c93fa517afd7a08d1e04d09d1
+  metadata.gz: fcd01686f33365c1ac6f9b6a0263da7df0d5952a4b7aa6a65f330d57fed4d6c3
+  data.tar.gz: eb7d575093c1faf0a60d3a16eff3d00049d23c689ac5701c0a019599b5397fbb
 SHA512:
-  metadata.gz: fac12797a1ebd3ae197a2622ea494cbbce2af911c0d3862510e742aa7b9a9aa1f01a37d336d5b551b80bf4440146a5541e72029a67599fda1aa733e3e7ce225e
-  data.tar.gz: 6c2e2ddda7b6921cb9a8c39c9138fd2d9dd8c2e8573a2bfee18191f671bf64e5b1a7dea57116a5d9b8d36d1744e5bb0cded3727c86175a5944d454fae7a1d611
+  metadata.gz: 5deb9e48f2e06484c6a695d4395cb0b0053925657d92854f9194aafb63ca5c7504871689a6c22a7bf71841eb04901d897a0ab7da0b235ccf4ef655d56f934117
+  data.tar.gz: 0bce465e2462ad3c330a7ca0c80f2bd17166d58373abd6d9552dda3df5101885f787696fa03c9228748403b3220582e7ef0b0f11180e6bd87ddef70309820af4

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

@@ -18,7 +18,8 @@ module Comee
       end
 
       def master_prices
-        data = MasterPrice.where(product_id: price_params[:product_ids])
+        data = MasterPrice.includes(:product_lookup, :supplier, :product)
+                          .where(product_id: price_params[:product_ids])
         render json: {success: true, data: serialize(data)}
       end
 

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

@@ -8,7 +8,7 @@ module Comee
         super do
           [
             Comee::Core::SalesOrder.includes(:customer_order, :fulfillment_center, :sales_order_items).all,
-            include: ["sales_order_items", "sales_order_items.product", "sales_order_items.unit"]
+            include: ["customer_order", "sales_order_items", "sales_order_items.product", "sales_order_items.unit"]
           ]
         end
       end

data/app/controllers/concerns/comee/core/common.rb

@@ -21,11 +21,7 @@ module Comee
         else
           data = @clazz.all
         end
-        # data, options = if block_given?
-        #                   yield
-        #                 else
-        #                   [@clazz.all, {}]
-        #                 end
+
         page = params[:page]
         if page
           render json: {success: true, data: serialize(data, options), page: page, total: @clazz.count}

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

@@ -0,0 +1,11 @@
+module Comee
+  module Core
+    class PickupSchedule < ApplicationRecord
+      enum :status, {draft: 0, confirmed: 1}
+
+      belongs_to :pod
+      belongs_to :time_slot
+      validates :status, presence: true
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Comee
+  module Core
+    class Pod < ApplicationRecord
+      enum :status, {draft: 0, confirmed: 1, signed: 2}
+
+      validates :reference_no, :status, presence: true
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ module Comee
       belongs_to :shipment_instruction
       belongs_to :shipment_item
       belongs_to :unit
+      belongs_to :pod, optional: true
 
       validates :delivery_note_no, :pallet_no, :goods_issue_date, presence: true
       validates :length, :width, :height, :weight, :quantity, :price, presence: true, numericality: {greater_than: 0}

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

@@ -138,7 +138,12 @@ module Comee
             status: SalesOrder.statuses[:draft]
           )
           order_items = order.customer_order_items.includes(:product, :unit)
-          client_prices = ClientPrice.where(client: order.client, product_id: order_items.map(&:product_id))
+          client_id = order.client.parent_id || order.client_id
+          client_prices = ClientPrice.where(
+            client_id: client_id,
+            product_id: order_items.map(&:product_id),
+            status: ClientPrice.statuses[:current]
+          )
           master_prices = MasterPrice.where(primary: true, status: Price.statuses[:current], product: order_items.map(&:product))
           items = order_items.each_with_object([]) do |item, res|
             next if item.canceled?

data/db/migrate/20240103074619_create_comee_core_pods.rb

@@ -0,0 +1,10 @@
+class CreateComeeCorePods < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_pods do |t|
+      t.string :reference_no, null: false
+      t.integer :status, null: false, default: 0
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20240104143246_create_comee_core_shipment_instruction_items.rb

@@ -22,6 +22,10 @@ class CreateComeeCoreShipmentInstructionItems < ActiveRecord::Migration[7.1]
                    index: {name: "unit_on_ccsii_indx"},
                    foreign_key: {to_table: :comee_core_units}
       t.float :price, null: false
+      t.references :pod,
+                   null: true,
+                   index: {name: "pod_on_ccsii_indx"},
+                   foreign_key: {to_table: :comee_core_pods}
 
       t.timestamps
     end

data/db/migrate/20240111112140_create_comee_core_pickup_schedules.rb

@@ -0,0 +1,20 @@
+class CreateComeeCorePickupSchedules < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_pickup_schedules do |t|
+      t.references :pod,
+                   null: false,
+                   index: {name: "pod_on_ccps_indx"},
+                   foreign_key: {to_table: :comee_core_pods}
+      t.references :time_slot,
+                   null: false,
+                   index: {name: "ts_on_ccps_indx"},
+                   foreign_key: {to_table: :comee_core_time_slots}
+      t.integer :status, null: false, default: 0
+      t.string :truck_no
+      t.string :driver_license_no
+      t.string :plate_no
+
+      t.timestamps
+    end
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.85".freeze
+    VERSION = "0.1.87".freeze
   end
 end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :pickup_schedule, class: "Comee::Core::PickupSchedule" do
+    pod
+    time_slot
+    status { Comee::Core::PickupSchedule.statuses[:draft] }
+    truck_no { Faker::Alphanumeric.alpha(number: 10) }
+    driver_license_no { Faker::Alphanumeric.alpha(number: 10) }
+    plate_no { Faker::Alphanumeric.alpha(number: 10) }
+  end
+end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :pod, class: "Comee::Core::Pod" do
+    reference_no { Faker::Alphanumeric.alpha(number: 10) }
+    status { Comee::Core::Pod.statuses[:draft] }
+  end
+end

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

@@ -2,6 +2,7 @@ FactoryBot.define do
   factory :shipment_instruction_item, class: "Comee::Core::ShipmentInstructionItem" do
     shipment_instruction
     shipment_item
+    pod { nil }
     delivery_note_no { Faker::Alphanumeric.alpha(number: 10) }
     pallet_no { Faker::Alphanumeric.alpha(number: 10) }
     goods_issue_date { Date.current.advance(days: 3) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.85
+  version: 0.1.87
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -331,6 +331,8 @@ files:
 - app/models/comee/core/master_price.rb
 - app/models/comee/core/notification.rb
 - app/models/comee/core/order_source.rb
+- app/models/comee/core/pickup_schedule.rb
+- app/models/comee/core/pod.rb
 - app/models/comee/core/price.rb
 - app/models/comee/core/product.rb
 - app/models/comee/core/product_lookup.rb
@@ -427,10 +429,12 @@ files:
 - db/migrate/20231206082503_create_comee_core_unit_conversions.rb
 - db/migrate/20231207153420_create_comee_core_shipment_items.rb
 - db/migrate/20231207235542_create_comee_core_item_statuses.rb
+- db/migrate/20240103074619_create_comee_core_pods.rb
 - db/migrate/20240104131607_create_comee_core_shipment_instructions.rb
 - db/migrate/20240104143246_create_comee_core_shipment_instruction_items.rb
 - db/migrate/20240109185749_create_comee_core_transport_availability.rb
 - db/migrate/20240109185931_create_comee_core_time_slots.rb
+- db/migrate/20240111112140_create_comee_core_pickup_schedules.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb
@@ -456,6 +460,8 @@ files:
 - spec/factories/comee/core/master_prices.rb
 - spec/factories/comee/core/notifications.rb
 - spec/factories/comee/core/order_sources.rb
+- spec/factories/comee/core/pickup_schedules.rb
+- spec/factories/comee/core/pods.rb
 - spec/factories/comee/core/product_lookups.rb
 - spec/factories/comee/core/products.rb
 - spec/factories/comee/core/purchase_order_items.rb