logistics_core 20.10.3 → 21.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81514660f26da73a58d10271aa5c8c2ac2495c01e9294aab3a80c53d16f3c8d9
-  data.tar.gz: 4842efbecfa140fa0994f44e316c672ba06cb9f7a7ae68cee3ef6cc5e0b72e24
+  metadata.gz: b0b4ba96f9be16a584acd02c42ab63cc65df7853a696f954208c49938445abbf
+  data.tar.gz: d18669a7ef8ebf73fc0e119e37ff81dee61d370c3f65280a5927b9b11bcc2612
 SHA512:
-  metadata.gz: 07d9c75abd272714f34c2da65a6ad198bd66697f9ac0b88e42480d26d50d35692a8330b3330f2f46b48633e87ea54e2a68e6daf6155aedd904da90269e7f883c
-  data.tar.gz: c7f0751450ed8e7f248b0d8d69531f7ed6e992647b47454b6f13313c5b64cac1e83e61c21bba04dd7e873cd81575e10c2ed8ad3357dee5dfc6caee18d48b181b
+  metadata.gz: c17ee3f0b18c6f578ad3eee7cd1cc6b2f0de756037365d6c66575323ce04e3a05df75383f21a979084fd77bf8463d23bb122faa0016826b03c35efcecf8aca5d
+  data.tar.gz: 462b4013b8278ca334bfabf0b0f62fa81750a5b6063303b49e55326902383a7163942b46c3d41505cf68216f8bcf72235bbc153f88177bcb860e936653da8997

data/app/controllers/logistics/core/operations_controller.rb

@@ -101,7 +101,11 @@ module Logistics
                                           :acquisition_mode_id, :payment_term_id, :delivery_term_id, :tin_number,
                                           :container_arrangement_id, :customs_transport_tariff_id, :transfer_tin_no,
                                           :warehouse_id, :trade_license_number, :esl_transport_tariff_id, :is_transfer,
-                                          :investment_license_number, :transfer_name, :transport_modality)
+                                          :investment_license_number, :transfer_name, :transport_modality, :free_days,
+                                          :vessel_etd, :vessel_eta, :invoice_submitted_to_client_on,
+                                          :invoice_submitted_to_finance_on, :demurrage, :storage, :payment_settled_on,
+                                          :departure_on, :arrival_on, :remark, :airway_bill_collected_from_airliner_on,
+                                          :airway_bill_delivered_to_client_on)
       end
     end
   end

data/app/models/logistics/core/offer_request.rb

@@ -73,7 +73,8 @@ module Logistics
       end
 
       def get_requests_by_security_status(security_status)
-        offer_requests = OfferRequest.where(security_status: security_status)
+        offer_requests = OfferRequest.includes(:transaction_type, :client, :communication_channel, :operation_type, :contract)
+                                     .where(security_status: security_status)
         return offer_requests
       end
 

data/app/models/logistics/core/operation_type.rb

@@ -1,6 +1,9 @@
 module Logistics
   module Core
     class OperationType < Lookup
+      SEA = 'Sea'.freeze
+      AIR = 'Air'.freeze
+      ROAD = 'Road'.freeze
     end
   end
-end
+end

data/app/models/logistics/core/transaction_type.rb

@@ -1,6 +1,8 @@
 module Logistics
   module Core
     class TransactionType < Lookup
+      IMPORT = 'Import'.freeze
+      EXPORT = 'Export'.freeze
     end
   end
-end
+end

data/app/serializers/logistics/core/operation_serializer.rb

@@ -9,7 +9,10 @@ module Logistics
                  :container_arrangement_id, :container_arrangement_name, :customs_transport_tariff_id,
                  :esl_transport_tariff_id, :warehouse_id, :warehouse_name, :trade_license_number, :tin_number, :t_number,
                  :investment_license_number, :load_level, :is_transfer, :transfer_name, :transfer_tin_no,
-                 :transport_modality, :request_no, :created_at, :client_reference
+                 :transport_modality, :request_no, :created_at, :client_reference, :free_days, :vessel_etd,
+                 :vessel_eta, :invoice_submitted_to_client_on, :invoice_submitted_to_finance_on, :demurrage, :storage,
+                 :payment_settled_on, :departure_on, :arrival_on, :remark, :airway_bill_collected_from_airliner_on,
+                 :airway_bill_delivered_to_client_on
     end
   end
-end
+end

data/app/serializers/logistics/core/simple_offer_request_serializer.rb

@@ -1,11 +1,7 @@
 module Logistics
   module Core
     class SimpleOfferRequestSerializer < ActiveModel::Serializer
-      attributes :id, :request_no, :name
-
-      def name
-        "#{object.request_no} #{object&.client&.name}"
-      end
+      attributes :id, :request_no
     end
   end
 end

data/app/serializers/logistics/core/simple_operation_serializer.rb

@@ -1,7 +1,10 @@
 module Logistics
   module Core
     class SimpleOperationSerializer < ActiveModel::Serializer
-      attributes :id, :operation_number, :created_at, :request_no, :client_reference
+      attributes :id, :operation_number, :created_at, :request_no, :client_reference, :free_days, :vessel_etd,
+                 :vessel_eta, :invoice_submitted_to_client_on, :invoice_submitted_to_finance_on, :demurrage, :storage,
+                 :payment_settled_on, :departure_on, :arrival_on, :remark, :airway_bill_collected_from_airliner_on,
+                 :airway_bill_delivered_to_client_on
     end
   end
-end
+end

data/db/migrate/20210311200310_add_optional_fields_to_operation.rb

@@ -0,0 +1,17 @@
+class AddOptionalFieldsToOperation < ActiveRecord::Migration[5.1]
+  def change
+    add_column :logistics_core_operations, :free_days, :integer
+    add_column :logistics_core_operations, :vessel_etd, :date
+    add_column :logistics_core_operations, :vessel_eta, :date
+    add_column :logistics_core_operations, :invoice_submitted_to_client_on, :date
+    add_column :logistics_core_operations, :invoice_submitted_to_finance_on, :date
+    add_column :logistics_core_operations, :demurrage,  :decimal
+    add_column :logistics_core_operations, :storage, :decimal
+    add_column :logistics_core_operations, :payment_settled_on, :date
+    add_column :logistics_core_operations, :departure_on, :date
+    add_column :logistics_core_operations, :arrival_on, :date
+    add_column :logistics_core_operations, :remark, :string
+    add_column :logistics_core_operations, :airway_bill_collected_from_airliner_on, :date
+    add_column :logistics_core_operations, :airway_bill_delivered_to_client_on, :date
+  end
+end

data/lib/logistics/core/version.rb

@@ -1,5 +1,5 @@
 module Logistics
 	module Core
-	  VERSION = '20.10.3'
+	  VERSION = '21.11.2'.freeze
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logistics_core
 version: !ruby/object:Gem::Version
-  version: 20.10.3
+  version: 21.11.2
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -572,6 +572,7 @@ files:
 - db/migrate/20200320085930_add_date_accepted_to_operation_documents.rb
 - db/migrate/20200903094152_add_per_file_field_to_chargeable_service.rb
 - db/migrate/20201011085541_add_acceptor_to_operation_document.rb
+- db/migrate/20210311200310_add_optional_fields_to_operation.rb
 - lib/logistics/core.rb
 - lib/logistics/core/engine.rb
 - lib/logistics/core/version.rb
@@ -659,7 +660,6 @@ files:
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/cable.yml
-- spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
@@ -680,8 +680,6 @@ files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/spring.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -982,7 +980,6 @@ test_files:
 - spec/dummy/config/environment.rb
 - spec/dummy/config/application.rb
 - spec/dummy/config/puma.rb
-- spec/dummy/config/database.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/application_controller_renderer.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
@@ -1003,8 +1000,6 @@ test_files:
 - spec/dummy/public/404.html
 - spec/dummy/public/apple-touch-icon-precomposed.png
 - spec/dummy/db/schema.rb
-- spec/dummy/log/test.log
-- spec/dummy/log/development.log
 - spec/route_helper.rb
 - spec/models/logistics/core/container_demurrage_rate_spec.rb
 - spec/models/logistics/core/content_type_spec.rb

data/spec/dummy/config/database.yml

@@ -1,19 +0,0 @@
-default: &default
-  adapter: postgresql
-  encoding: unicode
-  host: localhost
-  port: 5555
-  pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  timeout: 5000
-
-development:
-  <<: *default
-  database: logistics_core_development
-  username: postgres
-  password:
-
-test:
-  <<: *default
-  database: logistics_core_test
-  username: postgres
-  password: