comee_core 0.1.69 → 0.1.71

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e220664513363d940d77f8312b831a2c3468376a73cc4ec5b13a9b6c58fa7790
-  data.tar.gz: 6a96dfd1144056e9a4d0978c682c4af3541a999485b835d31356bf66b5f7e1f7
+  metadata.gz: af05a9a39c3e49d30c92aee06f9e27fbe4e02c7c1678a417df369fb88a6bf47b
+  data.tar.gz: a36ab5dcdaea7c2e22d8c41bbfc37d533a42b3472e83494124da6fe5bd9d311e
 SHA512:
-  metadata.gz: 6f48f16596d28fea625a7aef27b1b9d49c153f86a2af245c919392ee51d4cad138f7bf773dba1a32f32c3834cf2b6dc7d84ec7a5e70abf3ab3d902496ca68dbc
-  data.tar.gz: 2f52a6c778dcb8ef814b415e8a2c900e4edbda8e9d8c99979511efa6c1c9b0d35adf2146742c6f07d018dc4c8d7f66f057bf71683c8b743560103a215bc1bce2
+  metadata.gz: 3adaf0714c2d01b384b240884fe6dd94047cfa04b2f29d0271d97147b94708a8d35312b062b47fa18802e51720cda21e5a844b6e66045e6873287dbee6b93942
+  data.tar.gz: 9df735b384d02638be87742ac3d11f32eac8be43672c1d428d5ff66510b34308eb54f523b6c40717287a1000ed3ebaba74b50c76edff0d288dbccdfbb49aac1a

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

@@ -11,9 +11,47 @@ module Comee
       end
 
       def filter
-        @client_prices = Comee::Core::ClientPrice.ransack(params[:q]).result
+        @client_prices = Comee::Core::ClientPrice.includes(:client, :product, :unit).ransack(params[:q]).result
         @client_prices = @client_prices.then(&paginate)
-        render json: {success: true, data: serialize(@client_prices)}
+        queries = @client_prices.map { |cp| {itemable_id: cp.client_id, product_id: cp.product_id, itemable_type: "Comee::Core::Client"} }
+
+        lookups = queries.inject(Comee::Core::ProductLookup.none) do |conditions, condition|
+          conditions.or(Comee::Core::ProductLookup.where(condition))
+        end
+        result = @client_prices.each_with_object([]) do |obj, res|
+          item = {
+            id: obj.id,
+            valid_from: obj.valid_from,
+            valid_to: obj.valid_to,
+            price: obj.price,
+            status: obj.status,
+            margin: obj.margin,
+            margin_type: obj.margin_type,
+            client_code: obj.client.code,
+            client_name: obj.client.name,
+            client_address: obj.client.address,
+            product_code: obj.product.code,
+            product_name: obj.product.name,
+            product_description: obj.product.description,
+            product_preferred_units: obj.product.preferred_units,
+            product_weight: obj.product.weight,
+            product_weight_unit: obj.product.weight_unit,
+            product_dimensions: obj.product.dimensions,
+            product_hs_code: obj.product.hs_code,
+            product_hs_description: obj.product.hs_description,
+            product_image: obj.product.thumbnail_image_url,
+            unit_code: obj.unit.code,
+            unit_name: obj.unit.name
+          }
+          lkp = lookups.select { |lookup| lookup.itemable_id == obj.client_id && lookup.product_id == obj.product_id }
+          if lkp.count.positive?
+            item[:client_product_code] = lkp[0].code
+            item[:client_product_name] = lkp[0].item_description
+          end
+          res << item
+        end
+
+        render json: {success: true, data: result}
       end
 
       private

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

@@ -3,6 +3,11 @@ module Comee
     class ShipmentItemsController < ApplicationController
       include Common
 
+      def filter
+        @shipment_item = Comee::Core::ShipmentItem.ransack(params[:q]).result
+        render json: {success: true, data: serialize(@shipment_item)}
+      end
+
       def filter_with_status
         items = ShipmentItem.includes(sales_order_item: %i[sales_order product unit])
                             .ransack(params[:q]).result

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

@@ -7,6 +7,7 @@ module Comee
       belongs_to :fulfillment_center, optional: true
       has_many :sales_order_items
       has_many_attached :files
+      has_one :customs_detail
 
       enum :status, {draft: 0, submitted: 1, confirmed: 2, canceled: 3}
 

data/app/serializers/comee/core/sales_order_serializer.rb

@@ -2,7 +2,7 @@ module Comee
   module Core
     class SalesOrderSerializer < ActiveModel::Serializer
       attributes :id, :order_number, :payment_penalty, :status, :total_price, :payment_term, :delivery_term, :amount_paid, :pallete_note,
-                 :handover_date, :remark, :files_url
+                 :handover_date, :remark, :files_url, :customs_detail
       belongs_to :customer_order
       belongs_to :fulfillment_center
       has_many :sales_order_items

data/config/routes.rb

@@ -86,10 +86,10 @@ Comee::Core::Engine.routes.draw do
       get "suggest", controller: :sales_order_items, action: :suggest_values
     end
   end
-
   resources :shipment_items do
     collection do
       post "filter_with_status"
+      post "filter"
     end
   end
   post "/sales_orders/filter", controller: :sales_orders, action: :filter

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.69".freeze
+    VERSION = "0.1.71".freeze
   end
 end

metadata

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