comee_core 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 275dd64cebdedf362d37f4693eaeb8ced27c3569cdb3c90dbc37f0ae6d47e726
-  data.tar.gz: 16518da0b9c9bc06440d511b3aca1faca8e2bb820b919b9446ebfa66c89bc870
+  metadata.gz: e9ecb44f38bb1bbc8fe8accb8d1df84c10de099038728c077948c25584770250
+  data.tar.gz: 46c2e7d55a8ad2dd8abbc414f595a1128566c48d6c9e053bcdd849f9a32d4242
 SHA512:
-  metadata.gz: 00ddf02a0dba120f9d9d406002cdf20f1fbb81b2810b0e25bb67a6bec4dce6826c72fefec945980e098bde0c0ea7f5a51d8955d0756d01dfea959af9fd31c199
-  data.tar.gz: 25dcc78f332c7946e8271e71ae44c6c89f7900522a6ce45fc1695f78ceab2e832d69ff0908c60a0fcb45a7a16d298632f2deeb8fe9ae4b5bcc5970bf3717928e
+  metadata.gz: 86f577f8514711c9d0c32e81ce657016fc36b0d95b13f4e4e2953f9ff696688f6ffd5bd7cf9ed20df3b51349668f552df34bd7dc03fffb476ced35523e61b1c0
+  data.tar.gz: 9a65691ef5ba903d3ef4f501ba7f698608db2e01b5510693a238f944745e295374ac4b47288f3a337116ac6f14b14c4d13174bfe62c3b7cfcd7cb6b20343a006

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

@@ -65,7 +65,11 @@ module Comee
 
       def fetch_one
         price = ClientPrice.includes(:client, :product, :unit, :product_lookup)
-                           .find_by(client_id: params[:id], product_id: fetch_one_params[:product_id])
+                           .find_by(
+                             client_id: params[:id],
+                             product_id: fetch_one_params[:product_id],
+                             status: Price.statuses[:current]
+                           )
         render_content(price)
       end
 

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

@@ -3,8 +3,14 @@ module Comee
     class ClientsController < ApplicationController
       include Common
 
+      def index
+        super do
+          Client.includes(:parent, :agents, :contacts, :client_warehouses, :user, :currency).all
+        end
+      end
+
       def filter
-        clients = Client.includes(:parent, :agents, :contacts, :client_warehouses).ransack(params[:q]).result
+        clients = Client.includes(:parent, :agents, :contacts, :client_warehouses, :user, :currency).ransack(params[:q]).result
         render_content(clients)
       end
 

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

@@ -3,6 +3,15 @@ module Comee
     class CustomerOrderItemsController < ApplicationController
       include Common
 
+      def index
+        super do
+          [
+            CustomerOrderItem.includes(:product, :unit).all,
+            fields: ["unit"]
+          ]
+        end
+      end
+
       def cancel
         CustomerOrderItem.where(id: params[:ids]).update_all(canceled: true)
         render json: {success: true}
@@ -10,7 +19,7 @@ module Comee
 
       def filter
         data = CustomerOrderItem.includes(:product, :unit).ransack(params[:q]).result
-        render_content(data)
+        render_content(data, {fields: ["unit"]})
       end
 
       def destroy

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

@@ -5,6 +5,15 @@ module Comee
 
       before_action :set_service, only: %i[create_with_items submit submit_for_confirmation accept cancel]
 
+      def index
+        super do
+          [
+            CustomerOrder.includes(:client, :customer_order_items).all,
+            fields: ["client", "customer_order_items.unit"]
+          ]
+        end
+      end
+
       def create_with_items
         order = @service.create(create_with_item_params)
         render json: {success: true, data: serialize(order)}

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

@@ -9,6 +9,16 @@ module Comee
         end
       end
 
+      def fetch_one
+        lookup = ProductLookup.includes(:product)
+                              .find_by(
+                                itemable_id: params[:id],
+                                itemable_type: "Comee::Core::Client",
+                                product_id: fetch_one_params[:product_id]
+                              )
+        render_content(lookup)
+      end
+
       def filter
         data = ProductLookup.ransack(params[:q]).result
         render_content(data)
@@ -16,6 +26,10 @@ module Comee
 
       private
 
+      def fetch_one_params
+        params.permit(:product_id)
+      end
+
       def model_params
         params.required(:payload).permit(:code, :itemable_id, :itemable_type, :item_description, :product_id)
       end

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

@@ -1,7 +1,8 @@
 module Comee
   module Core
     class CustomerOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :customer_item_no, :quantity, :price, :total_price, :delivery_date, :canceled
+      attributes :id, :customer_item_no, :quantity, :price, :total_price, :delivery_date, :canceled, :customer_order_id,
+                 :product_id, :unit_id
       belongs_to :product
       belongs_to :unit
       belongs_to :customer_order

data/config/routes.rb

@@ -88,6 +88,7 @@ Comee::Core::Engine.routes.draw do
       post "create_agent"
       post "create_contact"
       post "price", controller: :client_prices, action: :fetch_one
+      post "product_lookup", controller: :product_lookups, action: :fetch_one
     end
     collection do
       post "filter"

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.10".freeze
+    VERSION = "0.2.11".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-04 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers