comee_core 0.1.80 → 0.1.81

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e66de25a6395ee13f7dd5bdf45a79d8fdda48df5037197f499c5000b2cd965e
-  data.tar.gz: f19d317e6465ebadc10aa01674f7e39651e9fa11a8875c62adadd418a8cad0f8
+  metadata.gz: a4318ef428c28e4dbcf4fe933ec2b485b451988f05b512743d27eee5279cd86f
+  data.tar.gz: d2ac11b22312a1ec6255c96f2bdcffed7339d4e5d53a8b547e5c478de715c509
 SHA512:
-  metadata.gz: f0c3b34e1015e9bd2b71d28d575514de6c346d5dc00e073160f28a6cfa15a78172b9b7215154c3f435d395ceeeb1e9062a2ba90a455073f5b752a62b037652b4
-  data.tar.gz: c57d6182fe854968524ef8184c5f92163e0c15e8c7fcf2f81fe46ef2e1b1de1d71587a9edfa609bbfe22ac56b1201a22cf162137829a24b3e462a679c3cf330b
+  metadata.gz: c466754e9b38187b8e07699ba940397ca8186350b074abaf193a133da26a53692935cbd8ffff307ba0ef8923f7ffa79cac8508d16662d81b270792269fea2acf
+  data.tar.gz: 0e053593a318be96788240fa1ecbe6116759a3096414bdee15df9795e7e110c74f992b6df4cec3eb0493608b55910111ecdb369e8c7efa9bf18b2c1796e17023

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

@@ -10,57 +10,24 @@ module Comee
         end
       end
 
+      def fetch_for_client
+        client = Comee::Core::Client.find(params[:id])
+        client_id = client.parent_id || client.id
+        prices = Comee::Core::ClientPrice.includes(:client, :product, :unit, :product_lookup)
+                                         .filter(client_id: client_id)
+        total = prices.count
+        prices = prices.then(&paginate)
+
+        render json: {success: true, data: serialize(prices), page: params[:page], total: total}
+      end
+
       def filter
-        @client_prices = Comee::Core::ClientPrice.includes(:client, :product, :unit).ransack(params[:q]).result
-        total = @client_prices.count
-        @client_prices = @client_prices.then(&paginate)
-        queries = @client_prices.map { |cp| {itemable_id: cp.client_id, product_id: cp.product_id, itemable_type: "Comee::Core::Client"} }
+        prices = Comee::Core::ClientPrice.includes(:client, :product, :unit, :product_lookup)
+                                         .ransack(params[:q]).result
+        total = prices.count
+        prices = prices.then(&paginate)
 
-        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_id: obj.client.id,
-            client_code: obj.client.code,
-            client_name: obj.client.name,
-            client_address: obj.client.address,
-            product_id: obj.product.id,
-            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_id: obj.unit.id,
-            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
-        result = {success: true, data: result}
-        page = params[:page]
-        if page
-          result[:page] = page
-          result[:total] = total
-        end
-        render json: result
+        render json: {success: true, data: serialize(prices), page: params[:page], total: total}
       end
 
       private

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

@@ -37,7 +37,7 @@ module Comee
       end
 
       def self.ransackable_associations(_auth_object = nil)
-        %w[product client]
+        %w[product client product_lookup]
       end
     end
   end

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

@@ -56,7 +56,7 @@ module Comee
       end
 
       def self.ransackable_associations(_auth_object = nil)
-        %w[product supplier]
+        %w[product supplier product_lookup]
       end
     end
   end

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

@@ -5,6 +5,7 @@ module Comee
       belongs_to :product
       belongs_to :client
       belongs_to :unit
+      belongs_to :product_lookup
     end
   end
 end

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

@@ -4,6 +4,7 @@ module Comee
       attributes :id, :purchase_price, :selling_price, :valid_from, :valid_to, :primary, :margin, :lead_time, :status
       belongs_to :product
       belongs_to :supplier
+      belongs_to :product_lookup
     end
   end
 end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.80".freeze
+    VERSION = "0.1.81".freeze
   end
 end

metadata

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