comee_core 0.1.68 → 0.1.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b8fdd8831c1aff501ec1d4628b22c24f647260b5fe16c0e1ef74b2d96c216c0
-  data.tar.gz: 47cd51809f26b8a4403ed05901d133b62ce7588bb436f5fac988d11e92c485c2
+  metadata.gz: 41ae0ec46096a9abb27fe3caddab921d382cf42daef4179106098dc3c91d4104
+  data.tar.gz: 4b3f9fcbe0c755257904faa791bdd8f7c7b8db9e7e55fa357e28408747f2de76
 SHA512:
-  metadata.gz: ebe4ec1df9d2eb6ada3b572b6c592f4592cf5d0d03f1877b428cea2f02e5abc7821de4968af7670a7f81d65f26944172410ae4a028457d5a06dc68db8d6038ae
-  data.tar.gz: e0515f1d51e41f26a7cd0f3d786d53b4fd6bc095430be347e491a3c7a1482cd5bfd24bc56b81e9901490fea714ff60fc5498dbc5422184154ad80c51da7249f5
+  metadata.gz: ada352a6d3bb9f520ff82f46726be54b39698aaba21991fdc8597ebc0cd725715f4d7256725615bde5476812dcfc8fda9f33edeb22716f99db21e358d2357470
+  data.tar.gz: 7626969d8a7904a01e265fa6b3be9894e8120de56c1aa221102b475a65facb34951c87f18defe565a845a0e48d89b7fb4faa40a0628b9c26fedbaf12ae9c5112

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

@@ -11,9 +11,38 @@ 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,
+            product_code: obj.product.code,
+            product_name: obj.product.name,
+            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/customer_orders_controller.rb

@@ -33,6 +33,11 @@ module Comee
         render json: {success: false, error: e.message}
       end
 
+      def filter
+        @customer_orders = Comee::Core::CustomerOrder.ransack(params[:q]).result
+        render json: {success: true, data: serialize(@customer_orders)}
+      end
+
       private
 
       def model_params

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/controllers/comee/core/suppliers_controller.rb

@@ -3,6 +3,11 @@ module Comee
     class SuppliersController < ApplicationController
       include Common
 
+      def filter
+        @supplier = Comee::Core::Supplier.ransack(params[:q]).result
+        render json: {success: true, data: serialize(@supplier)}
+      end
+
       private
 
       def model_params

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

@@ -5,6 +5,14 @@ module Comee
 
       validates :code, presence: true, uniqueness: true
       validates :name, :address, :locale, presence: true
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[user_id code address locale]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[user]
+      end
     end
   end
 end

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

@@ -8,6 +8,7 @@ Comee::Core::Engine.routes.draw do
       post "mark_as_unread", controller: :notifications, action: :mark_as_unread
     end
   end
+  post "/suppliers/filter", controller: :suppliers, action: :filter
   resources :suppliers
   resources :products do
     collection do
@@ -41,6 +42,7 @@ Comee::Core::Engine.routes.draw do
     end
   end
   resources :external_rfqs
+  post "/customer_orders/filter", controller: :customer_orders, action: :filter
   resources :customer_orders do
     member do
       post "submit"
@@ -84,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/db/migrate/20230728123039_create_comee_core_clients.rb

@@ -2,7 +2,7 @@ class CreateComeeCoreClients < ActiveRecord::Migration[7.0]
   def change
     create_table :comee_core_clients do |t|
       t.references :user,
-                   null: false,
+                   null: true,
                    index: {name: "user_on_ccc_indx"},
                    foreign_key: {to_table: :comee_core_users}
       t.string :code, null: false

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.68".freeze
+    VERSION = "0.1.70".freeze
   end
 end

metadata

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