comee_core 0.1.29 → 0.1.30

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 589381bfd5e0931074d18a87c8559e42edb1b3eb07adf97603609ce29f4f50a1
4
- data.tar.gz: 05bee510e99019aab8d77cdec3b04a4c46e5942f659c1408cb313f9c52ede5d4
3
+ metadata.gz: db5eb1e3ada88d6d43262f34c3524023af78b0488327494cb104896c513567b6
4
+ data.tar.gz: 62809e1252a790952c9940267c0337150f5b70dc485adb697e0d21fc2087939b
5
5
  SHA512:
6
- metadata.gz: cec0657364d59286b622ab05ab5604a2ed2c516b1ea1696127251e773e46c3baf957459f3b6b6e78768ea7c631fe5a845e055527926546ada1530dfb22e58e34
7
- data.tar.gz: 86d63cae7ea2efafb19dbd28950d2a1d5ed1e6c05af0ca4a2a4e6f21296d85208f2173f4844e9887180825480ef1c3dec603a3c60207c0530844d05b1e8246d8
6
+ metadata.gz: 10d651c16317a4daa58d15f6cc2acd6f239c23da54c6776ffb202682352b36b287f814bd1c9c469ceaffb3890041e072c63dbd84b45e71f9f652a05526f00c00
7
+ data.tar.gz: b5b2c66426c595d3d710beeac3a4d72f81152c0f20578525ba2c7c9281f07fbe6623df956cff56d9cb4052d59eafff5f1eeaa22a3196b45cadf531289a7d5f06
@@ -2,6 +2,7 @@ module Comee
2
2
  module Core
3
3
  class ApplicationController < ActionController::API
4
4
  include Comee::Core::Pagination
5
+
5
6
  before_action :authenticate
6
7
 
7
8
  def current_user
@@ -3,6 +3,13 @@ module Comee
3
3
  class ClientPricesController < ApplicationController
4
4
  include Comee::Core::Common
5
5
 
6
+ def index
7
+ super do
8
+ client_prices = Comee::Core::ClientPrice.all
9
+ client_prices.then(&paginate)
10
+ end
11
+ end
12
+
6
13
  def filter
7
14
  @client_prices = Comee::Core::ClientPrice.ransack(params[:q]).result
8
15
  render json: {success: true, data: serialize(@client_prices)}
@@ -6,7 +6,7 @@ module Comee
6
6
  belongs_to :back_order
7
7
  belongs_to :product
8
8
 
9
- validates :item_status, :from, :to, presence: true
9
+ validates :item_status, :from, :to, :delivery_date, presence: true
10
10
  validates :requested_quantity, :requested_unit_price, :supplier_quantity, :supplier_unit_price,
11
11
  presence: true, numericality: {greater_than: 0}
12
12
 
@@ -14,8 +14,11 @@ module Comee
14
14
  def validate_primary_price
15
15
  return unless product && primary
16
16
 
17
- count = MasterPrice.where(product: product, primary: true, active: true).count
18
- errors.add(:base, "There is already a primary supplier for item '#{product.code}'") if count.positive?
17
+ count = MasterPrice.where(product: product, primary: true, status: MasterPrice.statuses[:current]).count
18
+ return unless count.positive? && primary && MasterPrice.statuses[status] == MasterPrice.statuses[:current]
19
+
20
+ errors.add(:base,
21
+ "There is already a primary supplier for item '#{product.code}'")
19
22
  end
20
23
 
21
24
  def validate_purchase_price_validity_dates
@@ -15,6 +15,7 @@ class CreateComeeCoreBackOrderItems < ActiveRecord::Migration[7.0]
15
15
  t.float :supplier_unit_price, null: false
16
16
  t.date :from, null: false
17
17
  t.date :to, null: false
18
+ t.date :delivery_date, null: false
18
19
  t.integer :item_status, null: false, default: 0
19
20
  t.string :remark
20
21
 
@@ -1,5 +1,5 @@
1
1
  module Comee
2
2
  module Core
3
- VERSION = "0.1.29".freeze
3
+ VERSION = "0.1.30".freeze
4
4
  end
5
5
  end
@@ -6,6 +6,7 @@ FactoryBot.define do
6
6
  requested_unit_price { 50 }
7
7
  supplier_quantity { 5 }
8
8
  supplier_unit_price { 55 }
9
+ delivery_date { Date.current.advance(days: 6) }
9
10
  from { Date.current }
10
11
  to { Date.current.advance(months: 1) }
11
12
  item_status { Comee::Core::BackOrderItem.item_statuses[:available] }
@@ -1,7 +1,7 @@
1
1
  FactoryBot.define do
2
2
  factory :client, class: "Comee::Core::Client" do
3
3
  user
4
- code { Faker::Alphanumeric.alpha(number: 8) }
4
+ code { Faker::Alphanumeric.unique.alpha(number: 8) }
5
5
  name { Faker::Name.name }
6
6
  address { Faker::Address.full_address }
7
7
  locale { "en" }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: comee_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.29
4
+ version: 0.1.30
5
5
  platform: ruby
6
6
  authors:
7
7
  - Henock L.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-11-01 00:00:00.000000000 Z
11
+ date: 2023-11-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: active_model_serializers
@@ -150,6 +150,20 @@ dependencies:
150
150
  - - ">="
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
+ - !ruby/object:Gem::Dependency
154
+ name: rubocop-rspec
155
+ requirement: !ruby/object:Gem::Requirement
156
+ requirements:
157
+ - - ">="
158
+ - !ruby/object:Gem::Version
159
+ version: '0'
160
+ type: :development
161
+ prerelease: false
162
+ version_requirements: !ruby/object:Gem::Requirement
163
+ requirements:
164
+ - - ">="
165
+ - !ruby/object:Gem::Version
166
+ version: '0'
153
167
  - !ruby/object:Gem::Dependency
154
168
  name: shoulda-matchers
155
169
  requirement: !ruby/object:Gem::Requirement