ecom_core 1.0.9 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b59b8dbf20e8f81cb6c76f89b92f1b0b120a9b487846039b5c2b476d177ea8a
-  data.tar.gz: c254bb1490b4512d45f6add059f3e7a8685ccd571dca843e46e8a57c9c17b9fe
+  metadata.gz: 4bd257f6678b4a6d2d47ef80cd2748716388301e49b71af403d2822171486e12
+  data.tar.gz: 2a59d7ff332a8cad20eb48dab49ed92f7209f7211bd0fc2b0ce26fa565fe42b2
 SHA512:
-  metadata.gz: 6fadd3b668c06009686cdbadf0b13933d7dba415ca4e825fbb68889d380ce2803832494583bec9ccc4ac1bea28f6df79ac1da211482cc9a9b88c3fa7c1f719f5
-  data.tar.gz: ec05075973f8df540d177cb9ea188f2f68bdc7aa11250ffb164fc3bb3d9ac039df055a7251a52a54fda1c36166220ed1d3759a31e912a87bce256aaf986f4284
+  metadata.gz: b13fc4b2805f9d1b6459606bc672d2277ec41c8dc111269b29a89847383e845ecd7b22d265a7da697b7401c01d309898e655dd4fde2cab01b249fea6b9a4f61c
+  data.tar.gz: bb82c30965b9e6d2b81acc10c86c1171082fee2e3d8fdae3a9894caf4c180c4477edf5bdf53dfc0ff678ebecc615092f9548b87119b3e09e32531a3cf388889d

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 }
+      #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,7 @@
+module Ecom::Core
+  class Payment < ApplicationRecord
+    belongs_to :payroll
+    has_many :payment_details, class_name: 'Ecom::Core::PaymentDetail'
+    validates :from, :to, presence: true
+  end
+end

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

@@ -0,0 +1,10 @@
+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, 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/20191225211712_create_ecom_core_crew_times.rb

@@ -5,7 +5,7 @@ class CreateEcomCoreCrewTimes < ActiveRecord::Migration[6.0]
       t.time :checkin_time
       t.time :checkout_time
       t.float :hours, null: false
-      t.float :converted_hours, null: false
+      t.float :converted_hours, null: false, default: 0
       t.references :crew, index: { name: 'ct_on_crew_indx' }
       t.string :remark
       t.boolean :overtime, null: false, default: false

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/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.0.9'.freeze
+    VERSION = '1.0.14'.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,14 @@
+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 { 1.5 }
+    tax { 1.5 }
+    pension { 1.5 }
+    net_salary { 1.5 }
+    association :crew
+    association :payment
+  end
+end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :payment, class: 'Ecom::Core::Payment' do
+    from { Date.parse('2000-01-01') }
+    to { Date.parse('2000-01-15') }
+    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.9
+  version: 1.0.14
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-02-04 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,9 @@ 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
 - lib/ecom/core.rb
 - lib/ecom/core/engine.rb
 - lib/ecom/core/version.rb
@@ -261,6 +267,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