comee_core 0.1.59 → 0.1.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc17265c097efde637f01ce47d802dc358d7c4eee301d3b607a8f7d1ce71796b
-  data.tar.gz: e74e207006b6aec49ce1d0058331aeb440d200fd430bc9577c02c36fec52e8f2
+  metadata.gz: c663809128b4a531924cc39cc2b2acdc2ebcc13bf0a58c7baee7ea495c81baa2
+  data.tar.gz: 3d0b2fa555567992df840625f61b774b6b0484325a40692b0c344617a1b0e1db
 SHA512:
-  metadata.gz: b62c8b0421cdf260ea4b5fc152cedd7edac43dca8af1f56709a1523be5926dd7a15f7d398ea1b17363a50ef982b30e781d90de7bb807cb29bdad89d30b911dc3
-  data.tar.gz: aa49013dea68988bb5cb45d582f68238b1226ab00c5cedb8f3bcaaf1560c963cbf74f942d249a99b2b24f0533b6250edda517136e8c2d367b6df01b1204a72fa
+  metadata.gz: ca3073726cb726242aad1bc47e0fae40ecfa56ff8fb2c1e3886d5d93ad47bc190dbce1051aa284bfc0410c42c3586b95f0a535e10f33ef80c1688b4e8ad3933a
+  data.tar.gz: 27c36425bbf84ecb5b6e3041659a55478737c96f23f2e8039150ce30033d3432b5f8f56131e2ea58b404a4b5aefcbf7911e3c920e268c11897c754f920dcb328

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

@@ -12,6 +12,7 @@ module Comee
 
       def filter
         @client_prices = Comee::Core::ClientPrice.ransack(params[:q]).result
+        @client_prices = @client_prices.then(&paginate)
         render json: {success: true, data: serialize(@client_prices)}
       end
 

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

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

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

@@ -10,8 +10,9 @@ module Comee
       end
 
       def filter
-        query = QuotationRequest.ransack(params[:q])
-        render json: {success: true, data: serialize(query.result.includes(:client))}
+        query = QuotationRequest.ransack(params[:q]).result
+        query = query.then(&paginate)
+        render json: {success: true, data: serialize(query.includes(:client))}
       end
 
       def rfq_products_for_client
@@ -70,7 +71,7 @@ module Comee
 
       def rfq_params
         params.require(:payload).permit(:client_id, :order_number, :order_date, :delivery_address, :invoice_address,
-                                        items: %i[product_id unit_id quantity expected_delivery_date])
+                                        items: %i[product_id unit_id customer_item_no quantity expected_delivery_date])
       end
     end
   end

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

@@ -8,6 +8,10 @@ module Comee
       belongs_to :sales_order_item
 
       validates :hash_code, :status, :status_date, presence: true
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[hash_code status status_date sales_order_item_id]
+      end
     end
   end
 end

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

@@ -1,9 +1,8 @@
 module Comee
   module Core
     class CustomerOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :customer_item_no, :quantity, :price, :delivery_date, :canceled
+      attributes :id, :customer_item_no, :quantity, :price, :delivery_date, :canceled, :product, :unit
       belongs_to :product
-      belongs_to :customer_order
       belongs_to :unit
     end
   end

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

@@ -1,8 +1,7 @@
 module Comee
   module Core
     class CustomerOrderSerializer < ActiveModel::Serializer
-      attributes :id, :order_number, :order_date, :order_terms, :delivery_address, :invoice_address, :status, :file_url
-      belongs_to :client
+      attributes :id, :order_number, :order_date, :order_terms, :delivery_address, :invoice_address, :status, :file_url, :client
       has_many :customer_order_items
     end
   end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class QuotationRequestItemSerializer < ActiveModel::Serializer
-      attributes :id, :customer_item_no, :price, :discount, :valid_from, :valid_to
+      attributes :id, :customer_item_no, :price, :discount, :valid_from, :valid_to, :quantity, :expected_delivery_date
       belongs_to :product
       belongs_to :quotation_request
       belongs_to :unit

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

@@ -2,8 +2,8 @@ module Comee
   module Core
     class SalesOrderItemSerializer < ActiveModel::Serializer
       attributes :id, :customer_item_no, :quantity, :quantity_delivered, :price, :delivery_date, :eb_number, :lead_time, :comment,
-                 :action_note, :po_reference
-      belongs_to :sales_order
+                 :action_note, :po_reference, :product, :unit
+
       belongs_to :customer_order_item
       belongs_to :source
       belongs_to :unit

data/config/routes.rb

@@ -92,4 +92,5 @@ Comee::Core::Engine.routes.draw do
   end
   resources :customs_details
   resources :item_statuses
+  post "/item_statuses/filter", controller: :item_statuses, action: :filter
 end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.59".freeze
+    VERSION = "0.1.61".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.59
+  version: 0.1.61
 platform: ruby
 authors:
 - Henock L.