comee_core 0.1.43 → 0.1.45.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4614aa569251964bb6f680e1aaaf6cba4f2ce8a64f45d54751e18ad62378b871
-  data.tar.gz: 0f8f41bf2828f2292ee6e65906bb47c8888ebae8ed79e8e978bd7e6cdc432878
+  metadata.gz: e0a1374615af105f49b1ed679c3ff5d80ae3456eda013cd666132f82c1d47c2f
+  data.tar.gz: f093cc5c0239a5aa318f0928d33598ecd3184f0f49672d1a3fe99ee6f1025edf
 SHA512:
-  metadata.gz: 743afdd1aac35780b96ace42f00eb9cf14fd29cfb4cff61412121288846f8574ce1f7c61b955038b0cb6a31a900267e90bb29d11cf880403d107bca0d45e06ba
-  data.tar.gz: 1d3d427ef671fa0cf13bdb50424c6f4bd93edbc2822090dcc0dcb428e710a84547a14e5231815f892b05b2aa2886446053dd455ff5a36a11d3842488b41e8f6e
+  metadata.gz: '04811611e0a6b6248883685ad792fbc4e6055d67334c977aff9d1be1028059689790c93b834d237403f75f0935162875449397ef4a646f927ca29b52254119d7'
+  data.tar.gz: 8b029aa57a2ac60d4e76cdf246861e792d753a7d80f4e719fbf01f3ed80e4fd201322a970dbade704bf4b6a4acfe8487ea60ea742be34dc19c131a8042f9fae5

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

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

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

@@ -36,7 +36,8 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:order_number, :order_date, :order_terms, :delivery_address, :invoice_address, :status, :client_id)
+        params.require(:payload).permit(:order_number, :order_date, :order_terms, :delivery_address, :invoice_address, :status, :client_id,
+                                        :file)
       end
 
       def set_service

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

@@ -0,0 +1,37 @@
+module Comee
+  module Core
+    class CustomsDetailsController < ApplicationController
+      include Common
+
+      private
+
+      def model_params
+        params.require(:payload).permit(
+          :registration_type,
+          :export_declaration_type,
+          :participant_constellation,
+          :mode_of_transport_type,
+          :destination_country,
+          :containerized,
+          :additional_identifier,
+          :packaging_type,
+          :export_customs_office,
+          :customs_office_of_exit,
+          :mode_of_transport,
+          :delivery_term_code,
+          :mrn,
+          :office_number,
+          :quantity,
+          :characters_numbers,
+          :closure_mark1,
+          :closure_mark2,
+          :closure_mark3,
+          :closure_mark4,
+          :closure_mark5,
+          :transportation_route,
+          :sales_order_id
+        )
+      end
+    end
+  end
+end

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

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

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

@@ -10,10 +10,17 @@ module Comee
         end
       end
 
+      def show
+        super do
+          product = Comee::Core::Product.with_attached_images.find(params[:id])
+          product
+        end
+      end
+
       private
 
       def model_params
-        params.required(:payload).permit(:code, :name, :description, :parent_id)
+        params.required(:payload).permit(:code, :name, :description, :parent_id, :thumbnail_image, images: [])
       end
     end
   end

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

@@ -0,0 +1,18 @@
+module Comee
+  module Core
+    class PurchaseOrderItemsController < ApplicationController
+      include Common
+
+      def filter
+        @purchase_order_items = Comee::Core::PurchaseOrderItem.ransack(params[:q]).result
+        render json: {success: true, data: serialize(@purchase_order_items)}
+      end
+
+      private
+
+      def model_params
+        params.required(:payload).permit(:purchase_order_id, :sales_order_item_id, :quantity, :delivery_date, :status)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Comee
+  module Core
+    class PurchaseOrdersController < ApplicationController
+      include Common
+
+      def filter
+        @purchase_orders = Comee::Core::PurchaseOrder.ransack(params[:q]).result
+        render json: {success: true, data: serialize(@purchase_orders)}
+      end
+
+      private
+
+      def model_params
+        params.required(:payload).permit(:supplier_id, :order_date, :status, :delivery_address)
+      end
+    end
+  end
+end

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

@@ -40,7 +40,7 @@ module Comee
 
       def model_params
         params.require(:payload).permit(:order_number, :customer_order_id, :payment_penalty, :status,
-                                        :total_price, :amount_paid, :pallete_note, :handover_date, :remark)
+                                        :total_price, :amount_paid, :pallete_note, :handover_date, :remark, files: [])
       end
 
       def back_order_params

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

@@ -8,6 +8,17 @@ module Comee
       validates :code, uniqueness: true
 
       delegate(:name, to: :user, prefix: true)
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[
+          user_id
+          address
+          code
+          name
+          discount
+          locale
+        ]
+      end
     end
   end
 end

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

@@ -3,6 +3,7 @@ module Comee
     class CustomerOrder < ApplicationRecord
       belongs_to :client
       has_many :customer_order_items
+      has_one_attached :file
 
       enum :status, {draft: 0, submitted: 1, awaiting_confirmation: 2, accepted: 3, canceled: 4}
 
@@ -15,6 +16,10 @@ module Comee
       def self.ransackable_associations(_auth_object = nil)
         %w[client customer_order_items]
       end
+
+      def file_url
+        file.attached? ? Rails.application.routes.url_helpers.rails_blob_url(file, only_path: false) : nil
+      end
     end
   end
 end

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

@@ -0,0 +1,11 @@
+module Comee
+  module Core
+    class CustomsDetail < ApplicationRecord
+      belongs_to :sales_order
+
+      validates :registration_type, :export_declaration_type, :participant_constellation, :mode_of_transport_type, :destination_country,
+                :additional_identifier, :packaging_type, :export_customs_office, :customs_office_of_exit, :mode_of_transport,
+                :delivery_term_code, presence: true
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Comee
+  module Core
+    class Lookup < ApplicationRecord
+      validates :code, :name, :lookup_type, presence: true
+      validates :code, uniqueness: {scope: :lookup_type}
+    end
+  end
+end

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

@@ -25,7 +25,11 @@ module Comee
         return unless product && primary
 
         price = MasterPrice.find_by(product: product, primary: true, status: Price.statuses[:current])
-        return unless price && primary && price.id != id
+        Rails.logger.info("Existing price: ")
+        Rails.logger.info(price)
+        Rails.logger.info("Current price:")
+        Rails.logger.info(self)
+        return unless price && price.id != id
 
         errors.add(:base, "There is already a primary price entry for item '#{product.code}'")
       end

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

@@ -1,9 +1,12 @@
 module Comee
   module Core
     class Product < ApplicationRecord
-      has_ancestry
       after_save :update_parent, if: proc { |product| product.parent && product.parent.leaf? }
 
+      has_ancestry
+      has_one_attached :thumbnail_image
+      has_many_attached :images
+
       validates :code, presence: true, uniqueness: true
       validates :name, presence: true
 
@@ -14,6 +17,14 @@ module Comee
         obj.leaf = false
         obj.save!
       end
+
+      def thumbnail_image_url
+        thumbnail_image.attached? ? Rails.application.routes.url_helpers.rails_blob_url(thumbnail_image, only_path: false) : nil
+      end
+
+      def images_url
+        images.attached? ? images.map { |image| Rails.application.routes.url_helpers.rails_blob_url(image, only_path: false) } : []
+      end
     end
   end
 end

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

@@ -9,6 +9,14 @@ module Comee
         approved: 2,
         submitted_to_supplier: 3
       }
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[
+          supplier_id
+          order_date
+          status
+          delivery_address
+        ]
+      end
     end
   end
 end

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

@@ -15,6 +15,16 @@ module Comee
 
         errors.add(:sales_order_item, "must have an EB number.")
       end
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[
+          purchase_order_id
+          sales_order_item_id
+          quantity
+          delivery_date
+          status
+        ]
+      end
     end
   end
 end

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

@@ -5,6 +5,7 @@ module Comee
 
       belongs_to :customer_order
       has_many :sales_order_items
+      has_many_attached :files
 
       enum :status, {draft: 0, submitted: 1, confirmed: 2, canceled: 3}
 
@@ -36,6 +37,10 @@ module Comee
       def self.ransackable_associations(_auth_object = nil)
         []
       end
+
+      def files_url
+        files.attached? ? files.map { |file| Rails.application.routes.url_helpers.rails_blob_url(file, only_path: false) } : []
+      end
     end
   end
 end

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

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

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

@@ -0,0 +1,11 @@
+module Comee
+  module Core
+    class CustomsDetailSerializer < ActiveModel::Serializer
+      attributes :id, :registration_type, :export_declaration_type, :participant_constellation, :mode_of_transport_type,
+                 :destination_country, :containerized, :additional_identifier, :packaging_type, :export_customs_office,
+                 :customs_office_of_exit, :mode_of_transport, :delivery_term_code, :mrn, :office_number, :quantity,
+                 :characters_numbers, :closure_mark1, :closure_mark2, :closure_mark3, :closure_mark4, :closure_mark5,
+                 :transportation_route, :sales_order_id
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Comee
+  module Core
+    class LookupSerializer < ActiveModel::Serializer
+      attributes :id, :code, :name, :lookup_type
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class ProductSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :description
+      attributes :id, :code, :name, :description, :thumbnail_image_url, :images_url
     end
   end
 end

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

@@ -0,0 +1,7 @@
+module Comee
+  module Core
+    class PurchaseOrderItemSerializer < ActiveModel::Serializer
+      attributes :id, :sales_order_item_id, :purchase_order_id, :quantity, :delivery_date, :status
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Comee
+  module Core
+    class PurchaseOrderSerializer < ActiveModel::Serializer
+      attributes :id, :supplier_id, :order_date, :status, :delivery_address
+    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,
-                 :amount_paid, :pallete_note, :handover_date, :remark
+                 :amount_paid, :pallete_note, :handover_date, :remark, :files_url
       belongs_to :customer_order
       has_many :sales_order_items
     end

data/app/services/comee/core/customer_order_service.rb

@@ -33,8 +33,13 @@ module Comee
         order = CustomerOrder.find_by(id: id)
         raise(StandardError, "Customer order with id `#{id}` not found.") unless order
 
-        unless CustomerOrder.statuses[order.status] == CustomerOrder.statuses[:submitted]
-          raise(StandardError, "Customer order should be in submitted state.")
+        if CustomerOrder.statuses[order.status] == CustomerOrder.statuses[:accepted]
+          raise(StandardError, "Customer order is already in accepted state.")
+        end
+
+        allowed_statuses = [CustomerOrder.statuses[:submitted], CustomerOrder.statuses[:awaiting_confirmation]]
+        unless allowed_statuses.include?(CustomerOrder.statuses[order.status])
+          raise(StandardError, "Customer order should be in submitted or awaiting confirmation state.")
         end
 
         raise(StandardError, "Customer order does not have any items.") if order.customer_order_items.count.zero?

data/config/routes.rb

@@ -10,6 +10,7 @@ Comee::Core::Engine.routes.draw do
   end
   resources :suppliers
   resources :products
+  resources :lookups
   resources :quotation_requests do
     collection do
       post "filter"
@@ -42,23 +43,20 @@ Comee::Core::Engine.routes.draw do
       post "cancel"
     end
   end
-  resources :customer_orders, only: [] do
-    member do
-      get "order", controller: :customer_orders, action: :order
-      patch "cancel", controller: :customer_orders, action: :cancel
-      patch "seek_confirmation", controller: :customer_orders, action: :seek_confirmation
-      patch "submit", controller: :customer_orders, action: :submit
-      patch "accept", controller: :customer_orders, action: :accept
-      patch "bulk_cancel_items", controller: :customer_orders, action: :bulk_cancel_items
-    end
-  end
   resources :currencies
   resources :units
   resources :users
+  post "/purchase_orders/filter", controller: :purchase_orders, action: :filter
+  resources :purchase_orders
+  post "/purchase_order_items/filter", controller: :purchase_order_items, action: :filter
+  resources :purchase_order_items
   resources :clients do
     member do
       get "rfq_products", controller: :quotation_requests, action: :rfq_products_for_client
     end
+    collection do
+      post "filter"
+    end
   end
   post "/client_prices/filter", controller: :client_prices, action: :filter
   resources :client_prices
@@ -81,4 +79,5 @@ Comee::Core::Engine.routes.draw do
       post "cancel"
     end
   end
+  resources :customs_details
 end

data/db/migrate/20231125111539_create_comee_core_lookups.rb

@@ -0,0 +1,15 @@
+class CreateComeeCoreLookups < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_lookups do |t|
+      t.string :code, null: false
+      t.string :name, null: false
+      t.string :lookup_type, null: false
+
+      t.timestamps
+    end
+    add_index :comee_core_lookups,
+              %i[code lookup_type],
+              unique: true,
+              name: "code_type_on_ccl_indx"
+  end
+end

data/db/migrate/20231125115522_create_comee_core_customs_details.rb

@@ -0,0 +1,34 @@
+class CreateComeeCoreCustomsDetails < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_customs_details do |t|
+      t.references :sales_order,
+                   null: false,
+                   index: {name: "soi_on_cccd_indx"},
+                   foreign_key: {to_table: :comee_core_sales_orders}
+      t.string :registration_type, null: false
+      t.string :export_declaration_type, null: false
+      t.string :participant_constellation, null: false
+      t.string :mode_of_transport_type, null: false
+      t.string :destination_country, null: false
+      t.boolean :containerized, null: false, default: false
+      t.string :additional_identifier, null: false
+      t.string :packaging_type, null: false
+      t.string :export_customs_office, null: false
+      t.string :customs_office_of_exit, null: false
+      t.string :mode_of_transport, null: false
+      t.string :delivery_term_code, null: false
+      t.string :mrn
+      t.string :office_number
+      t.float :quantity
+      t.string :characters_numbers
+      t.string :closure_mark1
+      t.string :closure_mark2
+      t.string :closure_mark3
+      t.string :closure_mark4
+      t.string :closure_mark5
+      t.jsonb :transportation_route
+
+      t.timestamps
+    end
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.43".freeze
+    VERSION = "0.1.45.pre".freeze
   end
 end

data/spec/factories/comee/core/customs_details.rb

@@ -0,0 +1,26 @@
+FactoryBot.define do
+  factory :customs_detail, class: "Comee::Core::CustomsDetail" do
+    sales_order
+    registration_type { "CO - Common Products" }
+    export_declaration_type { "00000100" }
+    participant_constellation { "0000 - Anmelder ist Ausführer" }
+    mode_of_transport_type { "10 - IMO-Schiffnummer" }
+    destination_country { "Schiffs- und Luftfahrzeugbedarf" }
+    containerized { true }
+    additional_identifier { "HH01 - Billbrookdeich 36" }
+    packaging_type { "CT- Karton" }
+    export_customs_office { "DE004851 - Hamburg" }
+    customs_office_of_exit { "BE10100 - ANTWERPEN DAE" }
+    mode_of_transport { "1 - Seeverkehr" }
+    delivery_term_code { "EXW - Ab Werk" }
+    mrn { Faker::Alphanumeric.alpha(number: 10) }
+    office_number { Faker::Alphanumeric.alpha(number: 10) }
+    characters_numbers { Faker::Alphanumeric.alpha(number: 10) }
+    closure_mark1 { Faker::Lorem.word }
+    closure_mark2 { Faker::Lorem.word }
+    closure_mark3 { Faker::Lorem.word }
+    closure_mark4 { Faker::Lorem.word }
+    closure_mark5 { Faker::Lorem.word }
+    transportation_route { [{order: 1, route: "DE - Deutschland", value: 0}, {order: 2, route: "FR - Frankreich", value: 0}] }
+  end
+end

data/spec/factories/comee/core/lookups.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :lookup, class: "Comee::Core::Lookup" do
+    code { Faker::Alphanumeric.alpha(number: 8) }
+    name { Faker::Lorem.word }
+    lookup_type { Faker::Alphanumeric.alpha(number: 8) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.43
+  version: 0.1.45.pre
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -52,6 +52,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: image_processing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.12.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.12.2
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -266,9 +286,13 @@ files:
 - app/controllers/comee/core/currencies_controller.rb
 - app/controllers/comee/core/customer_order_items_controller.rb
 - app/controllers/comee/core/customer_orders_controller.rb
+- app/controllers/comee/core/customs_details_controller.rb
 - app/controllers/comee/core/external_rfqs_controller.rb
+- app/controllers/comee/core/lookups_controller.rb
 - app/controllers/comee/core/notifications_controller.rb
 - app/controllers/comee/core/products_controller.rb
+- app/controllers/comee/core/purchase_order_items_controller.rb
+- app/controllers/comee/core/purchase_orders_controller.rb
 - app/controllers/comee/core/quotation_request_items_controller.rb
 - app/controllers/comee/core/quotation_requests_controller.rb
 - app/controllers/comee/core/sales_order_items_controller.rb
@@ -290,12 +314,14 @@ files:
 - app/models/comee/core/currency.rb
 - app/models/comee/core/customer_order.rb
 - app/models/comee/core/customer_order_item.rb
+- app/models/comee/core/customs_detail.rb
 - app/models/comee/core/edi_order.rb
 - app/models/comee/core/external_rfq.rb
 - app/models/comee/core/field_mapping.rb
 - app/models/comee/core/inventory.rb
 - app/models/comee/core/invoice.rb
 - app/models/comee/core/invoice_item.rb
+- app/models/comee/core/lookup.rb
 - app/models/comee/core/master_price.rb
 - app/models/comee/core/notification.rb
 - app/models/comee/core/order_source.rb
@@ -319,9 +345,13 @@ files:
 - app/serializers/comee/core/currency_serializer.rb
 - app/serializers/comee/core/customer_order_item_serializer.rb
 - app/serializers/comee/core/customer_order_serializer.rb
+- app/serializers/comee/core/customs_detail_serializer.rb
 - app/serializers/comee/core/external_rfq_serializer.rb
+- app/serializers/comee/core/lookup_serializer.rb
 - app/serializers/comee/core/product_serializer.rb
 - app/serializers/comee/core/product_type_serializer.rb
+- app/serializers/comee/core/purchase_order_item_serializer.rb
+- app/serializers/comee/core/purchase_order_serializer.rb
 - app/serializers/comee/core/quotation_request_item_serializer.rb
 - app/serializers/comee/core/quotation_request_serializer.rb
 - app/serializers/comee/core/sales_order_item_serializer.rb
@@ -370,6 +400,8 @@ files:
 - db/migrate/20231121094339_create_comee_core_quotation_requests.rb
 - db/migrate/20231121132709_create_comee_core_quotation_request_items.rb
 - db/migrate/20231122094424_create_comee_core_external_rfqs.rb
+- db/migrate/20231125111539_create_comee_core_lookups.rb
+- db/migrate/20231125115522_create_comee_core_customs_details.rb
 - db/migrate/20231125122723_create_comee_core_purchase_orders.rb
 - db/migrate/20231126082907_create_comee_core_purchase_order_items.rb
 - lib/comee/core.rb
@@ -385,12 +417,14 @@ files:
 - spec/factories/comee/core/currencies.rb
 - spec/factories/comee/core/customer_order_items.rb
 - spec/factories/comee/core/customer_orders.rb
+- spec/factories/comee/core/customs_details.rb
 - spec/factories/comee/core/edi_orders.rb
 - spec/factories/comee/core/external_rfqs.rb
 - spec/factories/comee/core/field_mappings.rb
 - spec/factories/comee/core/inventories.rb
 - spec/factories/comee/core/invoice_items.rb
 - spec/factories/comee/core/invoices.rb
+- spec/factories/comee/core/lookups.rb
 - spec/factories/comee/core/master_prices.rb
 - spec/factories/comee/core/notifications.rb
 - spec/factories/comee/core/order_sources.rb
@@ -425,9 +459,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: