ecom_core 1.0.11 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb99a2389da27cf20e597f3df0f857dbf1de773c2255d045bb55759067ffb4c
-  data.tar.gz: d9f3e700661b7801a39edb4bcf37e7b19fe5de32d2649efc41d340dd0bed89a7
+  metadata.gz: 788f4d113098571cc799a0c9279597378b44d653f7515118c01b2fa164afd243
+  data.tar.gz: f109fdd69d9da9cc717c35d824f831982da67c087eece901b9c2c8eccf893e07
 SHA512:
-  metadata.gz: 989e447f42b80d4cb90244824f55e1aedfa4bed71ba6cb01c1cd0c03f097be9f4baa74a57188b2e7ee86ec6a84aa8d5932ecdad97754a2489df8b3a7609784c1
-  data.tar.gz: 7930b48144947c87148205ac07e4aa4fe297df099984d32ec844ab88fe824e3d24fe44ce13f667e0e655ad364e9d635d10ea91791f2ed530e01485f7cd90e847
+  metadata.gz: a2aeae45d21fc34414c778230e8607fe086bd794e4db3b712d1a3700ed6a71f0dc5e54b4341f8fdc77ddbc570a720625ff14827eb675108af4e60d084a0ef03f
+  data.tar.gz: 4a2221c71893ce5f70457a5c90330beadae19af3f4cbde506dda97283e8be871dd1895afd624e75a48ff05afb235863370aeb3f6f742eef740345199d008fa63

data/app/models/ecom/core/crew.rb

@@ -4,12 +4,19 @@ module Ecom
       PERMANENT = 'Permanent'.freeze
       TEMPORARY = 'Temporary'.freeze
 
+      before_save :set_employment_date,
+                  if: proc { |c| c.employment_date.nil? }
+
       belongs_to :crew_type
 
       validates :name, :qualification, presence: true
       validates :employment, inclusion: [PERMANENT, TEMPORARY]
       #validates :wage, presence: true, if: ->(o) { o.employment == PERMANENT }
       #validates :wage, absence: true, if: ->(o) { o.employment == TEMPORARY }
+
+      def set_employment_date
+        self.employment_date = Date.today
+      end
     end
   end
 end

data/app/models/ecom/core/payment.rb

@@ -0,0 +1,20 @@
+module Ecom
+  module Core
+    class Payment < ApplicationRecord
+      belongs_to :payroll
+      has_many :payment_details, class_name: 'Ecom::Core::PaymentDetail', dependent: :destroy
+      validates :from, :to, presence: true
+
+      before_validation :set_payment_order
+
+      def set_payment_order
+        unless payroll
+          self.payment_order = 1
+          return
+        end
+        previous_payment = payroll.payments.find_by(approved: true)
+        self.payment_order = previous_payment ? previous_payment.payment_order + 1 : 1
+      end
+    end
+  end
+end

data/app/models/ecom/core/payment_detail.rb

@@ -0,0 +1,11 @@
+module Ecom
+  module Core
+    class PaymentDetail < ApplicationRecord
+      belongs_to :crew
+      belongs_to :payment
+
+      validates :hours, :ot_hours, :base_salary, :overtime, :gross_salary, :tax, :pension, :net_salary, :net_pay,
+                presence: true
+    end
+  end
+end

data/app/models/ecom/core/payroll.rb

@@ -0,0 +1,9 @@
+module Ecom
+  module Core
+    class Payroll < ApplicationRecord
+      validates :month, :year, presence: true
+
+      has_many :payments, class_name: 'Ecom::Core::Payment'
+    end
+  end
+end

data/db/migrate/20191225100054_create_ecom_core_crews.rb

@@ -7,6 +7,10 @@ class CreateEcomCoreCrews < ActiveRecord::Migration[6.0]
       t.string :qualification, null: false
       t.string :employment, null: false
       t.float :wage
+      t.date :employment_date
+      t.boolean :sub_contracted, null: false, default: false
+      t.string :guarantor_name
+      t.string :guarantor_phone
       t.boolean :active, null: false, default: true
       t.references :crew_type, index: { name: 'crew_on_ct_indx' }
 

data/db/migrate/20200126081005_create_ecom_core_payrolls.rb

@@ -0,0 +1,11 @@
+class CreateEcomCorePayrolls < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_payrolls do |t|
+      t.integer :month, null: false
+      t.integer :year, null: false
+      t.boolean :approved, null: false, default: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20200126082103_create_ecom_core_payments.rb

@@ -0,0 +1,13 @@
+class CreateEcomCorePayments < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_payments do |t|
+      t.date :from, null: false
+      t.date :to, null: false
+      t.references :payroll, null: false, index: { name: 'payments_on_payroll_indx' }
+
+      t.timestamps
+    end
+
+    add_foreign_key :ecom_core_payments, :ecom_core_payrolls, column: :payroll_id
+  end
+end

data/db/migrate/20200126183218_create_ecom_core_payment_details.rb

@@ -0,0 +1,21 @@
+class CreateEcomCorePaymentDetails < ActiveRecord::Migration[6.0]
+  def change
+    create_table :ecom_core_payment_details do |t|
+      t.float :hours, null: false
+      t.float :ot_hours, null: false, default: 0
+      t.float :base_salary, null: false
+      t.float :overtime, null: false, default: 0
+      t.float :gross_salary, null: false
+      t.float :tax, null: false, default: 0
+      t.float :pension, null: false, default: 0
+      t.float :net_salary, null: false
+      t.references :crew, null: false, index: { name: 'pd_on_crew_indx' }
+      t.references :payment, null: false, index: { name: 'pd_on_payment_indx' }
+
+      t.timestamps
+    end
+
+    add_foreign_key :ecom_core_payment_details, :ecom_core_crews, column: :crew_id
+    add_foreign_key :ecom_core_payment_details, :ecom_core_payments, column: :payment_id
+  end
+end

data/db/migrate/20200207035823_add_additional_columns_to_payment.rb

@@ -0,0 +1,6 @@
+class AddAdditionalColumnsToPayment < ActiveRecord::Migration[6.0]
+  def change
+    add_column :ecom_core_payments, :approved, :boolean, null: false, default: false
+    add_column :ecom_core_payments, :payment_order, :integer, null: false, default: 1
+  end
+end

data/db/migrate/20200207040844_add_net_pay_column_to_payment_details.rb

@@ -0,0 +1,5 @@
+class AddNetPayColumnToPaymentDetails < ActiveRecord::Migration[6.0]
+  def change
+    add_column :ecom_core_payment_details, :net_pay, :float, null: false, default: 0
+  end
+end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.0.11'.freeze
+    VERSION = '1.0.16'.freeze
   end
 end

data/spec/factories/ecom/core/crews.rb

@@ -6,6 +6,10 @@ FactoryBot.define do
     qualification { FFaker::Name.name }
     employment { Ecom::Core::Crew::PERMANENT }
     wage { FFaker::Random.rand(1000..5000) }
+    employment_date { Date.today }
+    sub_contracted { false }
+    guarantor_name { FFaker::Name.name }
+    guarantor_phone { FFaker::Name.name }
     active { true }
 
     association :crew_type

data/spec/factories/ecom/core/payment_details.rb

@@ -0,0 +1,15 @@
+FactoryBot.define do
+  factory :payment_detail, class: 'Ecom::Core::PaymentDetail' do
+    hours { 1.5 }
+    ot_hours { 1.5 }
+    base_salary { 1.5 }
+    overtime { 1.5 }
+    gross_salary { 100 }
+    tax { 15 }
+    pension { 5 }
+    net_salary { 80 }
+    net_pay { 80 }
+    association :crew
+    association :payment
+  end
+end

data/spec/factories/ecom/core/payments.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :payment, class: 'Ecom::Core::Payment' do
+    from { Date.parse('2000-01-01') }
+    to { Date.parse('2000-01-15') }
+    approved { false }
+    payment_order { 1 }
+    association :payroll
+  end
+end

data/spec/factories/ecom/core/payrolls.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :payroll, class: 'Ecom::Core::Payroll' do
+    month { 1 }
+    year { 2000 }
+    approved { false }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.16
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -206,6 +206,9 @@ files:
 - app/models/ecom/core/material_type.rb
 - app/models/ecom/core/menu.rb
 - app/models/ecom/core/overtime_type.rb
+- app/models/ecom/core/payment.rb
+- app/models/ecom/core/payment_detail.rb
+- app/models/ecom/core/payroll.rb
 - app/models/ecom/core/product_type.rb
 - app/models/ecom/core/project.rb
 - app/models/ecom/core/resource_type.rb
@@ -246,6 +249,11 @@ files:
 - db/migrate/20191206104247_create_ecom_core_work_components.rb
 - db/migrate/20191225100054_create_ecom_core_crews.rb
 - db/migrate/20191225211712_create_ecom_core_crew_times.rb
+- db/migrate/20200126081005_create_ecom_core_payrolls.rb
+- db/migrate/20200126082103_create_ecom_core_payments.rb
+- db/migrate/20200126183218_create_ecom_core_payment_details.rb
+- db/migrate/20200207035823_add_additional_columns_to_payment.rb
+- db/migrate/20200207040844_add_net_pay_column_to_payment_details.rb
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -261,6 +269,9 @@ files:
 - spec/factories/ecom/core/material_types.rb
 - spec/factories/ecom/core/menus.rb
 - spec/factories/ecom/core/overtime_types.rb
+- spec/factories/ecom/core/payment_details.rb
+- spec/factories/ecom/core/payments.rb
+- spec/factories/ecom/core/payrolls.rb
 - spec/factories/ecom/core/product_types.rb
 - spec/factories/ecom/core/projects.rb
 - spec/factories/ecom/core/resource_types.rb