comee_core 0.1.95 → 0.1.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62dcad3a9c54fa4baab6cfc0005d14a5e5d92a1228c92bf58a06db59924f5eaa
-  data.tar.gz: 4c583e798e129fdc08f828eac92a5509a606461c991a663c9fda3080a268d1d9
+  metadata.gz: 0cb92df3470f8c017719aaedbe6c51315760869a45a018f2c551a8d069d0f815
+  data.tar.gz: d981a86bc337820f64b63b8f4e5d95d44482f772ff8f222b276f5f4b56ff6190
 SHA512:
-  metadata.gz: db5be5a689f25ec330ccb19880e42a02a71b030c58d1996782f63bbff79c1563a5831bef77e05157193ece75f1eb683d6fdd0f99b64531128c780bf6f2de4876
-  data.tar.gz: f527934aa3a048fa49a5504d3b2b65b39907323019e55d28c886974d79d62aa641c1948b4e100e29cc4ccb0ca4f89df1da667c06fa1ba1b92d895b1d5006f405
+  metadata.gz: bb572acac1f0630247da9380f43d22edc32c289e3cdf998b91517f37eec10a9cd01edbf122e9183e0c5d8b61a2a04630d2a6fac679fad53e6ae9212541f2a590
+  data.tar.gz: 76d0cf07ad78fccd24d09a9eb8db389e3a8c10801e0cd2898fe958918a99f0861e557d7185703b79bfbd3b18adaf858511fa3973b70991617dee3e481794cb2b

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

@@ -0,0 +1,13 @@
+module Comee
+  module Core
+    class AgentsController < ApplicationController
+      include Common
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:name, :address, :email, :telephone)
+      end
+    end
+  end
+end

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

@@ -5,6 +5,19 @@ module Comee
 
       before_action :authenticate
 
+      def render_content(data, options = {})
+        result = {success: true}
+        if params[:page]
+          total = data.count
+          data = data.then(&paginate)
+          result[:page] = params[:page].to_i
+          result[:total] = total
+        end
+        result[:data] = options.key?(:fields) ? serialize(data, include: options[:fields]) : serialize(data)
+
+        render json: result
+      end
+
       def current_user
         return if token.nil?
 
@@ -27,8 +40,8 @@ module Comee
 
       private
 
-      def serialize(data)
-        ActiveModelSerializers::SerializableResource.new(data)
+      def serialize(data, options = {})
+        ActiveModelSerializers::SerializableResource.new(data, options)
       end
 
       def token

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

@@ -21,8 +21,8 @@ module Comee
       end
 
       def filter
-        query = Comee::Core::BackOrder.ransack(params[:q])
-        render json: {success: true, data: serialize(query.result.includes(:back_order_items, :supplier))}
+        data = BackOrder.includes(:back_order_items, :supplier).ransack(params[:q]).result
+        render_content(data)
       end
 
       def model_params

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

@@ -5,8 +5,7 @@ module Comee
 
       def index
         super do
-          client_prices = ClientPrice.all
-          client_prices.then(&paginate)
+          ClientPrice.includes(:client, :product, :unit, :product_lookup).all
         end
       end
 
@@ -15,19 +14,13 @@ module Comee
         client_id = client.parent_id || client.id
         prices = ClientPrice.includes(:client, :product, :unit, :product_lookup)
                             .where(client_id: client_id)
-        total = prices.count
-        prices = prices.then(&paginate)
-
-        render json: {success: true, data: serialize(prices), page: params[:page], total: total}
+        render_content(prices)
       end
 
       def filter
         prices = ClientPrice.includes(:client, :product, :unit, :product_lookup)
                             .ransack(params[:q]).result
-        total = prices.count
-        prices = prices.then(&paginate)
-
-        render json: {success: true, data: serialize(prices), page: params[:page], total: total}
+        render_content(prices)
       end
 
       private

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

@@ -0,0 +1,13 @@
+module Comee
+  module Core
+    class ClientWarehousesController < ApplicationController
+      include Common
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:name, :description, :address, :client_id)
+      end
+    end
+  end
+end

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

@@ -4,28 +4,61 @@ module Comee
       include Common
 
       def filter
-        @clients = Comee::Core::Client.ransack(params[:q]).result
-        render json: {success: true, data: serialize(@clients)}
+        clients = Client.includes(:parent, :agents, :contacts, :client_warehouses).ransack(params[:q]).result
+        render_content(clients)
       end
 
       def consignees
-        client = Comee::Core::Client.find(params[:id])
+        client = Client.find(params[:id])
         render json: {success: true, data: client.consignees}
       rescue StandardError => e
-        render json: {success: false, error: e.message}
+        render json: {success: false, error: e.message}, status: :unprocessable_entity
       end
 
-      def shipment_addresses
-        client = Comee::Core::Client.find(params[:id])
-        render json: {success: true, data: client.shipment_addresses}
+      def create_agent
+        client = Client.includes(:parent, :agents, :contacts, :client_warehouses).find(params[:id])
+        agent = Agent.new(agent_params)
+        if agent.save
+          client.agents << agent
+          client.save!
+          render_content(client)
+        else
+          render json: {success: false, error: agent.errors.full_messages[0]}, status: :unprocessable_entity
+        end
+      end
+
+      def create_contact
+        client = Client.includes(:parent, :agents, :contacts, :client_warehouses).find(params[:id])
+        contact = Contact.new(contact_params)
+        if contact.save
+          client.contacts << contact
+          client.save!
+          render_content(client)
+        else
+          render json: {success: false, error: contact.errors.full_messages[0]}, status: :unprocessable_entity
+        end
+      end
+
+      def agents
+        client = Client.find(params[:id])
+        render_content(client.agents)
       rescue StandardError => e
-        render json: {success: false, error: e.message}
+        render json: {success: false, error: e.message}, status: :unprocessable_entity
       end
 
       private
 
       def model_params
-        params.require(:payload).permit(:code, :name, :address, :locale, :user_id, :parent_id, consignees: [], shipment_addresses: [])
+        params.require(:payload).permit(:code, :name, :address, :locale, :user_id, :parent_id, :currency,
+                                        consignees: [])
+      end
+
+      def agent_params
+        params.require(:payload).permit(:name, :address, :email, :telephone)
+      end
+
+      def contact_params
+        params.require(:payload).permit(:first_name, :last_name, :email, :telephone)
       end
     end
   end

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

@@ -0,0 +1,13 @@
+module Comee
+  module Core
+    class ContactsController < ApplicationController
+      include Common
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:first_name, :last_name, :email, :telephone)
+      end
+    end
+  end
+end

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

@@ -9,8 +9,8 @@ module Comee
       end
 
       def filter
-        query = CustomerOrderItem.ransack(params[:q])
-        render json: {success: true, data: serialize(query.result.includes(:product))}
+        data = CustomerOrderItem.includes(:product, :unit).ransack(params[:q]).result
+        render_content(data)
       end
 
       def destroy
@@ -32,6 +32,7 @@ module Comee
                 :customer_item_no,
                 :quantity,
                 :price,
+                :total_price,
                 :delivery_date,
                 :canceled,
                 :product_id,

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

@@ -39,8 +39,8 @@ module Comee
       end
 
       def filter
-        @customer_orders = Comee::Core::CustomerOrder.ransack(params[:q]).result
-        render json: {success: true, data: serialize(@customer_orders)}
+        orders = CustomerOrder.includes(:client, :customer_order_items).ransack(params[:q]).result
+        render_content(orders)
       end
 
       private
@@ -59,7 +59,7 @@ module Comee
               .permit(
                 :order_number, :order_date, :order_terms, :consignee, :shipment_address, :final_destination,
                 :final_delivery_date, :handover_date, :shipping_date, :delivery_address, :invoice_address, :status, :client_id,
-                items: %i[customer_item_no product_id quantity price unit_id delivery_date]
+                items: %i[customer_item_no product_id quantity price total_price unit_id delivery_date]
               )
       end
 

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

@@ -4,8 +4,8 @@ module Comee
       include Common
 
       def filter
-        @item_statuses = Comee::Core::ItemStatus.ransack(params[:q]).result
-        render json: {success: true, data: serialize(@item_statuses)}
+        item_statuses = ItemStatus.ransack(params[:q]).result
+        render_content(item_statuses)
       end
 
       private

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

@@ -4,18 +4,18 @@ module Comee
       before_action :set_notification, only: %i[mark_as_read mark_as_unread]
 
       def index
-        data = Comee::Core::Notification.messages(current_user.notifications.newest_first)
-        render json: {success: true, data: data}
+        data = Notification.messages(current_user.notifications.newest_first)
+        render_content(data)
       end
 
       def read
         data = Notification.messages(current_user.notifications.read.newest_first)
-        render json: {success: true, data: data}
+        render_content(data)
       end
 
       def unread
         data = Notification.messages(current_user.notifications.unread.newest_first)
-        render json: {success: true, data: data}
+        render_content(data)
       end
 
       def mark_as_read

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

@@ -10,8 +10,8 @@ module Comee
       end
 
       def filter
-        lookups = ProductLookup.ransack(params[:q]).result
-        render json: {success: true, data: serialize(lookups)}
+        data = ProductLookup.ransack(params[:q]).result
+        render_content(data)
       end
 
       private

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

@@ -5,37 +5,35 @@ module Comee
 
       def index
         super do
-          products = Product.leafs
-          products.then(&paginate)
+          Product.leafs
         end
       end
 
       def show
         super do
-          product = Comee::Core::Product.with_attached_images.find(params[:id])
-          product
+          Comee::Core::Product.with_attached_images.find(params[:id])
         end
       end
 
       def master_prices
         data = MasterPrice.includes(:product_lookup, :supplier, :product)
                           .where(product_id: price_params[:product_ids])
-        render json: {success: true, data: serialize(data)}
+        render_content(data)
       end
 
       def client_prices
         data = ClientPrice.where(product_id: price_params[:product_ids])
-        render json: {success: true, data: serialize(data)}
+        render_content(data)
       end
 
       def categories
         root = Product.find_by(code: "root")
-        render json: {success: true, data: serialize(root.children)}
+        render_content(root.children)
       end
 
       def filter
-        products = Product.ransack(params[:q]).result
-        render json: {success: true, data: serialize(products)}
+        data = Product.ransack(params[:q]).result
+        render_content(data)
       end
 
       private

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

@@ -4,8 +4,8 @@ module Comee
       include Common
 
       def filter
-        @purchase_order_items = Comee::Core::PurchaseOrderItem.ransack(params[:q]).result
-        render json: {success: true, data: serialize(@purchase_order_items)}
+        data = PurchaseOrderItem.ransack(params[:q]).result
+        render_content(data)
       end
 
       private

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

@@ -4,8 +4,8 @@ module Comee
       include Common
 
       def filter
-        @purchase_orders = Comee::Core::PurchaseOrder.ransack(params[:q]).result
-        render json: {success: true, data: serialize(@purchase_orders)}
+        data = Comee::Core::PurchaseOrder.ransack(params[:q]).result
+        render_content(data)
       end
 
       private

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

@@ -9,8 +9,8 @@ module Comee
       end
 
       def filter
-        query = QuotationRequestItem.ransack(params[:q])
-        render json: {success: true, data: serialize(query.result.includes(:product))}
+        data = QuotationRequestItem.includes(:product, :quotation_request, :unit).ransack(params[:q]).result
+        render_content(data)
       end
 
       def destroy

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

@@ -10,9 +10,8 @@ module Comee
       end
 
       def filter
-        query = QuotationRequest.ransack(params[:q]).result
-        query = query.then(&paginate)
-        render json: {success: true, data: serialize(query.includes(:client))}
+        data = QuotationRequest.includes(:client).ransack(params[:q]).result
+        render_content(data)
       end
 
       def rfq_products_for_client
@@ -20,20 +19,20 @@ module Comee
         root = Product.roots.first
         ids = root.indirect_ids - client_products
         products = Product.where(id: ids)
-        render json: {success: true, data: serialize(products)}
+        render_content(products)
       end
 
       def create_request_with_items
         service = QuotationRequestService.new
         parameters = rfq_params.to_h.deep_symbolize_keys
         result = service.create_request_with_items(parameters)
-        render json: {success: true, data: serialize(result)}
+        render_content(result)
       end
 
       def submit
         service = QuotationRequestService.new
         rfq = service.submit(params[:id])
-        render json: {success: true, data: serialize(rfq)}
+        render_content(rfq)
       rescue StandardError => e
         render json: {success: false, error: e.message}
       end
@@ -41,7 +40,7 @@ module Comee
       def submit_for_confirmation
         service = QuotationRequestService.new
         rfq = service.submit_for_confirmation(params[:id])
-        render json: {success: true, data: serialize(rfq)}
+        render_content(rfq)
       rescue StandardError => e
         render json: {success: false, error: e.message}
       end
@@ -49,7 +48,7 @@ module Comee
       def confirm
         service = QuotationRequestService.new
         rfq = service.confirm(params[:id])
-        render json: {success: true, data: serialize(rfq)}
+        render_content(rfq)
       rescue StandardError => e
         render json: {success: false, error: e.message}
       end
@@ -57,7 +56,7 @@ module Comee
       def convert
         service = QuotationRequestService.new
         order = service.convert_to_order(params[:id])
-        render json: {success: true, data: serialize(order)}
+        render_content(order)
       rescue StandardError => e
         render json: {success: false, error: e.message}
       end

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

@@ -5,7 +5,7 @@ module Comee
 
       def index
         super do
-          Comee::Core::SalesOrderItem.includes(
+          SalesOrderItem.includes(
             :sales_order,
             :customer_order_item,
             :source,

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

@@ -6,35 +6,41 @@ module Comee
 
       def index
         super do
+          data = SalesOrder.includes(:customer_order, :fulfillment_center, :sales_order_items, :client).all
           [
-            Comee::Core::SalesOrder.includes(:customer_order, :fulfillment_center, :sales_order_items).all,
-            include: ["client", "customer_order", "sales_order_items", "sales_order_items.product", "sales_order_items.unit"]
+            data,
+            fields: ["client", "customer_order", "sales_order_items", "sales_order_items.product", "sales_order_items.unit"]
           ]
         end
       end
 
       def filter
-        @sales_order = Comee::Core::SalesOrder.ransack(params[:q]).result
-        render json: {success: true, data: serialize(@sales_order)}
+        data = SalesOrder.includes(
+          :customer_order,
+          :client,
+          :fulfillment_center,
+          :sales_order_items
+        ).ransack(params[:q]).result
+        render_content(data)
       end
 
       def submit
         order = @service.submit(params[:id])
-        render json: {success: true, data: serialize(order)}
+        render_content(order)
       rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
       def confirm
         order = @service.confirm(params[:id])
-        render json: {success: true, data: serialize(order)}
+        render_content(order)
       rescue StandardError => e
         render json: {success: false, error: e.message}
       end
 
       def cancel
         order = @service.cancel(params[:id])
-        render json: {success: true, data: serialize(order)}
+        render_content(order)
       rescue StandardError => e
         render json: {success: false, error: e.message}
       end

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

@@ -7,26 +7,27 @@ module Comee
         super do
           [
             ShipmentItem.includes(sales_order_item: [sales_order: :client]).all,
-            include: ["sales_order_item.sales_order.client"]
+            fields: ["sales_order_item.sales_order.client"]
           ]
         end
       end
 
       def filter
-        @shipment_item = Comee::Core::ShipmentItem.ransack(params[:q]).result
-        render json: {success: true, data: serialize(@shipment_item)}
+        shipment_item = ShipmentItem.includes(:sales_order_item).ransack(params[:q]).result
+        options = {fields: ["sales_order_item.sales_order.client"]}
+        render_content(shipment_item, options)
       end
 
       def filter_for_client
-        shipment_items = Comee::Core::ShipmentItem.joins(sales_order_item: :sales_order)
-                                                  .where(
-                                                    comee_core_sales_order_items: {
-                                                      comee_core_sales_orders: {
-                                                        client_id: params[:id]
-                                                      }
-                                                    }
-                                                  )
-        render json: {success: true, data: serialize(shipment_items)}
+        shipment_items = ShipmentItem.joins(sales_order_item: :sales_order)
+                                     .where(
+                                       comee_core_sales_order_items: {
+                                         comee_core_sales_orders: {
+                                           client_id: params[:id]
+                                         }
+                                       }
+                                     )
+        render_content(shipment_items)
       end
 
       def filter_with_status

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

@@ -5,21 +5,19 @@ module Comee
 
       def index
         super do
-          Supplier.all.then(&paginate)
+          Supplier.includes(:currency).all
         end
       end
 
       def filter
-        suppliers = Comee::Core::Supplier.ransack(params[:q]).result
-        total = suppliers.count
-        suppliers = suppliers.then(&paginate)
-        render json: {success: true, data: serialize(suppliers), page: params[:page], total: total}
+        suppliers = Supplier.includes(:currency).ransack(params[:q]).result
+        render_content(suppliers)
       end
 
       private
 
       def model_params
-        params.require(:payload).permit(:code, :name, :address, :locale)
+        params.require(:payload).permit(:code, :name, :address, :locale, :currency_id)
       end
     end
   end

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

@@ -5,7 +5,7 @@ module Comee
 
       def index
         super do
-          Comee::Core::UnitConversion.includes(:from, :to).all
+          UnitConversion.includes(:from, :to).all
         end
       end
 

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

@@ -5,7 +5,7 @@ module Comee
 
       def filter
         units = Unit.ransack(params[:q]).result
-        render json: {success: true, data: serialize(units)}
+        render_content(units)
       end
 
       private

data/app/controllers/concerns/comee/core/common.rb

@@ -2,6 +2,7 @@ module Comee
   module Core
     module Common
       extend ActiveSupport::Concern
+      include Pagination
 
       included do
         before_action :set_clazz
@@ -15,23 +16,48 @@ module Comee
           incoming = yield
           if incoming.instance_of?(Array)
             data, options = incoming
+          elsif incoming.instance_of?(Hash)
+            options = incoming
           else
             data = incoming
           end
         else
           data = @clazz.all
         end
-
-        page = params[:page]
-        if page
-          render json: {success: true, data: serialize(data, options), page: page, total: @clazz.count}
-        else
-          render json: {success: true, data: serialize(data, options)}
+        total = data.count
+        data = data.then(&paginate) if params[:page]
+        result = {
+          success: true,
+          data: options.key?(:fields) ? serialize(data, include: options[:fields]) : serialize(data)
+        }
+        if params[:page]
+          result[:page] = params[:page]
+          result[:total] = total
         end
+
+        render json: result
       end
 
       def show
-        render json: {success: true, data: serialize(@obj)}
+        data = nil
+        options = {}
+        if block_given?
+          incoming = yield
+          if incoming.instance_of?(Array)
+            data, options = incoming
+          elsif incoming.instance_of?(Hash)
+            options = incoming
+          else
+            data = incoming
+          end
+        else
+          data = @obj
+        end
+        result = {
+          success: true,
+          data: options.key?(:fields) ? serialize(data, include: options[:fields]) : serialize(data)
+        }
+        render json: result
       end
 
       def create

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

@@ -0,0 +1,7 @@
+module Comee
+  module Core
+    class Agent < ApplicationRecord
+      validates :name, :email, :telephone, presence: true
+    end
+  end
+end