ecom_core 1.2.19 → 1.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dec564e431b435c4775432757843f7d46c2c98d0c3858bb783e8325b630ba84f
-  data.tar.gz: 6831882fb350c6d92d1324a7f6d3fcf6a95ec334af3b551b11b6e24c93c29c75
+  metadata.gz: 57de1b5bb610121618f09d6623d8f83e5c38e4d0f91415264c0c90008c4aca92
+  data.tar.gz: 2d1c048ac5692e8675a86a3fd769f5a3200be47d7790fd7df1ac25a7f1e6b045
 SHA512:
-  metadata.gz: a9043260a84f6ad95cb2e3ba02329f50bb60a98159b143e58db19c5273bacc1d15d6df538ee460ded92e519071741ac32e6003ec29ae659548109d806ea50d36
-  data.tar.gz: 0e280d833e3b19ce2c87ec29f3d7880e20d015e712c289c027785c885bb8b3b601e8347ecf1290ac26bd14c5b7ccc8cae7fbbc2ecb911b3ef0f2cd97d03f87ba
+  metadata.gz: 5d32fb2ceea452a4327a86d3b0521ba719ed45bbf1392c754270686aeca4fb406bba683bb4ce7a60748ddcbd74f7fe1f955701eea507d5077b10ab6dfa23ac0c
+  data.tar.gz: 2a89d665d5ca5899193ce27d423ada50b36bf03a5a728c803b7839e0d15bab8a875eebd43152d66fbe7e378fdfd7522ac80cc4763f0903cfc7c1bcc195dbb4ec

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

@@ -1,10 +1,33 @@
 module Ecom
   module Core
     class Company < ApplicationRecord
+      # The settings attribute is a json string containing setting key value
+      # pairs. The valid settings are:
+      #   payroll_periods => a list of payroll period values. Each
+      #                      payroll period has the following entries:
+      #     order: A numeric value indicating the order of the period.
+      #     date: A numeric value indicating the date of each month which
+      #           upto which timesheet data is used for payroll calculation
+      #           for the specific period.
+      #     comparison: One of [:exact, :days_before_month_end]. :exact will
+      #            force calculations to be made upto the exact mentioned date
+      #            value, whereas :days_before_month_end is often used for last
+      #            period payroll calculation and we want to specify on which date
+      #            before the end of the month we have to limit timesheet data to
+      #            calculate payroll. E.g. 3 days before month end would be 27th
+      #            for september and 28th for october.
+      #
+      #   period_count - the total number of periods per month for payroll.
+      #            this value should align with the defined payroll periods.
+      #
       has_many :projects
 
       validates :code, :name, :address, :telephone, presence: true
       validates :code, :name, uniqueness: true
+
+      def valid_settings?
+        settings['payroll_periods'].count == settings['period_count']
+      end
     end
   end
 end

data/db/migrate/20190101085530_create_ecom_core_companies.rb

@@ -6,7 +6,7 @@ class CreateEcomCoreCompanies < ActiveRecord::Migration[6.0]
       t.string :address, null: false
       t.string :telephone, null: false
       t.string :email
-      t.json :settings
+      t.jsonb :settings, default: {}
 
       t.timestamps
     end

data/lib/ecom/core/version.rb

@@ -1,5 +1,5 @@
 module Ecom
   module Core
-    VERSION = '1.2.19'.freeze
+    VERSION = '1.2.20'.freeze
   end
 end

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

@@ -7,5 +7,11 @@ FactoryBot.define do
     address { FFaker::Address.street_address }
     telephone { FFaker::PhoneNumber.phone_number }
     email { FFaker::Internet.email }
+    settings do
+      {
+        payroll_periods: [{ order: 1, date: 25, comparison: :exact }],
+        period_count: 1
+      }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecom_core
 version: !ruby/object:Gem::Version
-  version: 1.2.19
+  version: 1.2.20
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm