comee_core 0.1.88 → 0.1.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01c398f40ebb3c1eacff4a3566d4707168d4e121b95442e0f59361c2e5a6520a
-  data.tar.gz: 3059c69cb31e958457aadaf294cf2f9925862d08890633e0d9451240c221614d
+  metadata.gz: 756042163169e327bbf9e028c6666dbec6f9c52e907cf5d35b210ca37b310533
+  data.tar.gz: 9c3f9bee0f3b28e6988c490babdb6e56329fe546300920d1d287eb917fca1554
 SHA512:
-  metadata.gz: fab7383b8a87484ea330c21efe291089625d6c1cf4271200bfff9451e0ab29d8d041332f31575ac2bfa92bb387df97bbf4e6f1512203f8c4ac3f4afb36b89f85
-  data.tar.gz: 613a9df5c11b6f9ad4fae560d8e87fbe9bbc01ff2397741cd79c061235fc060d9571c46a8b78df3b0d613c79d77dfb0ff7b1ab0bac3494086ffb87c9353519c1
+  metadata.gz: 757759703fb6cf5f2dac0e7c9dadb29a7c7317c53f788d9a6993cd2ea49cad72c80727ec7d643c2259f5acc21a90aad0e12ce4d27292209429b202af3dbf23db
+  data.tar.gz: 95a9135eb3ad74e2a8666cbcbd8c151f2a19dc801f9249110f01bd1137e664a138958bad4038a309130428296742930f2f73efd4b46369fbded65bd7e280f006

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

@@ -25,39 +25,12 @@ module Comee
         render json: {success: true}
       end
 
-      # def filter_with_status
-      #   items = SalesOrderItem.includes(:sales_order, :product, :unit)
-      #                         .ransack(params[:q]).result
-      #   statuses = ItemStatus.where(sales_order_item_id: items.map(&:id))
-      #                        .select("MAX(id) AS max_id, sales_order_item_id")
-      #                        .group(:sales_order_item_id)
-      #                        .all
-      #   ids = statuses.map(&:max_id)
-      #   statuses = ItemStatus.where(id: ids).each_with_object({}) { |status, res| res[status.sales_order_item_id] = status }
-      #   result = items.each_with_object([]) do |item, res|
-      #     status = statuses[item.id]
-      #     data = {
-      #       sales_order_no: item.sales_order.order_number,
-      #       customer_item_no: item.customer_item_no,
-      #       product_code: item.product.code,
-      #       unit: item.unit.code,
-      #       quantity: item.quantity,
-      #       delivery_date: item.delivery_date,
-      #       handover_date: item.sales_order.handover_date,
-      #       po_reference: item.po_reference,
-      #       status: status&.status
-      #     }
-      #     res << data.merge(status&.details)
-      #   end
-      #   render json: {success: true, data: result}
-      # end
-
       private
 
       def model_params
         params.require(:payload).permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
-                                        :customer_item_no, :price, :delivery_date, :eb_number, :lead_time, :comment, :action_note,
-                                        :po_reference, :pallet_no, :source_id)
+                                        :customer_item_no, :price, :handover_date, :delivery_date, :eb_number, :lead_time, :comment,
+                                        :action_note, :po_reference, :pallet_no, :source_id)
       end
     end
   end

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

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

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

@@ -6,6 +6,10 @@ module Comee
       belongs_to :pod
       belongs_to :time_slot
       validates :status, presence: true
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[driver_license_no plate_no pod_id status time_slot_id truck_no]
+      end
     end
   end
 end

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

@@ -2,6 +2,7 @@ module Comee
   module Core
     class Pod < ApplicationRecord
       enum :status, {draft: 0, confirmed: 1, signed: 2}
+      has_many :shipment_instruction_items
 
       validates :reference_no, :status, presence: true
     end

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

@@ -11,6 +11,10 @@ module Comee
         self.weekday = availability_date.strftime("%A")
         self.weekday_short = availability_date.strftime("%a")
       end
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[availability_date weekday weekday_short]
+      end
     end
   end
 end

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

@@ -13,6 +13,10 @@ module Comee
 
         aliases.map(&:downcase!)
       end
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[code name unit_type]
+      end
     end
   end
 end

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

@@ -1,8 +1,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
+      attributes :id, :customer_item_no, :quantity, :quantity_delivered, :price, :handover_date, :delivery_date, :eb_number,
+                 :lead_time, :comment, :action_note, :po_reference
 
       belongs_to :sales_order
       belongs_to :customer_order_item

data/config/routes.rb

@@ -66,7 +66,11 @@ Comee::Core::Engine.routes.draw do
     end
   end
   resources :currencies
-  resources :units
+  resources :units do
+    collection do
+      post "filter"
+    end
+  end
   resources :unit_conversions
   resources :users
   post "/purchase_orders/filter", controller: :purchase_orders, action: :filter

data/config/spring.rb

@@ -1 +1 @@
-Spring.application_root = "spec/dummy"
+Spring.application_root = "./spec/dummy"

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.88".freeze
+    VERSION = "0.1.90".freeze
   end
 end

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :transport_availability, class: "Comee::Core::TransportAvailability" do
     availability_date do
-      d = Date.current
+      d = Faker::Date.between(from: Date.current, to: Date.current.advance(months: 6))
       d.advance(days: 1) if d.wday == 7
       d.advance(days: 2) if d.wday == 6
       d

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.88
+  version: 0.1.90
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -240,34 +240,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: spring
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: spring-commands-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: An engine which contains core models and end-points for the COMee ERP.
 email:
 - henockl@live.com