comee_core 0.1.85 → 0.1.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65a6f4cc76af66361e5d6d21999a8a38a0c2598f83980632783f7b1add6488ca
-  data.tar.gz: 554dc63474d64f44982cb4aea62040ab41f65c4c93fa517afd7a08d1e04d09d1
+  metadata.gz: d65b99689edf889ecb6989545c88f1260ccecdea8f645fc1978fbebc945a8290
+  data.tar.gz: 418de27bfd37fe7a5021aa4984083254e1b74298b665b9d0e43438fb321b0c95
 SHA512:
-  metadata.gz: fac12797a1ebd3ae197a2622ea494cbbce2af911c0d3862510e742aa7b9a9aa1f01a37d336d5b551b80bf4440146a5541e72029a67599fda1aa733e3e7ce225e
-  data.tar.gz: 6c2e2ddda7b6921cb9a8c39c9138fd2d9dd8c2e8573a2bfee18191f671bf64e5b1a7dea57116a5d9b8d36d1744e5bb0cded3727c86175a5944d454fae7a1d611
+  metadata.gz: 9500aada926628c911f6d385620e1d65f609e8ef84f1d85aa3797a5e4272d90cc37da473a865d85c235ab3b3215829b75930e20efb471425363a4dfe057cf226
+  data.tar.gz: 10ccb38fd0821b0f9e56c94b27dfef547845593d33d23a8e19fe23cb691341e23c638d6b65cfe9c2185b7b592a4e2877b5c12469725af398ae102f183c503110

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/models/comee/core/proof_of_delivery.rb

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

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/20240110074619_create_comee_core_proof_of_deliveries.rb

@@ -0,0 +1,13 @@
+class CreateComeeCoreProofOfDeliveries < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_proof_of_deliveries do |t|
+      t.string :reference_no, null: false
+      t.string :status, null: false, default: 0
+      t.string :driver
+      t.string :truck
+      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.86".freeze
   end
 end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :proof_of_delivery, class: "Comee::Core::ProofOfDelivery" do
+    reference_no { Faker::Alphanumeric.alpha(number: 10) }
+    status { Comee::Core::ProofOfDelivery.statuses[:draft] }
+    driver { Faker::Name.name }
+    truck { Faker::Alphanumeric.alpha(number: 6) }
+    plate_no { Faker::Alphanumeric.alpha(number: 8) }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.85
+  version: 0.1.86
 platform: ruby
 authors:
 - Henock L.
@@ -334,6 +334,7 @@ files:
 - app/models/comee/core/price.rb
 - app/models/comee/core/product.rb
 - app/models/comee/core/product_lookup.rb
+- app/models/comee/core/proof_of_delivery.rb
 - app/models/comee/core/purchase_order.rb
 - app/models/comee/core/purchase_order_item.rb
 - app/models/comee/core/quotation_request.rb
@@ -431,6 +432,7 @@ files:
 - 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/20240110074619_create_comee_core_proof_of_deliveries.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb
@@ -458,6 +460,7 @@ files:
 - spec/factories/comee/core/order_sources.rb
 - spec/factories/comee/core/product_lookups.rb
 - spec/factories/comee/core/products.rb
+- spec/factories/comee/core/proof_of_deliveries.rb
 - spec/factories/comee/core/purchase_order_items.rb
 - spec/factories/comee/core/purchase_orders.rb
 - spec/factories/comee/core/quotation_request_items.rb