OBPIH-6114 Add tiered pricing to product supplier (#4530)

* OBPIH-6114 Add tiered pricing to product supplier * OBPIH-6114 Set default tiered pricing to false on command
openboxes · Mar 12, 2024 · 8031cdb · 8031cdb
1 parent 7afa7f5
commit 8031cdb
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 0 deletions.
diff --git a/grails-app/domain/org/pih/warehouse/product/ProductSupplier.groovy b/grails-app/domain/org/pih/warehouse/product/ProductSupplier.groovy
@@ -63,6 +63,8 @@ class ProductSupplier implements Serializable, Comparable<ProductSupplier> {
  // Additional comments
  String comments
 
+ Boolean tieredPricing = false
+
  // Auditing fields
  Date dateCreated
  Date lastUpdated
@@ -239,6 +241,7 @@ class ProductSupplier implements Serializable, Comparable<ProductSupplier> {
  manufacturerCode: manufacturerCode,
  brandName: brandName,
  attributes: attributes,
+ tieredPricing: tieredPricing,
  ]
  }
 }
diff --git a/.../migrations/0.9.x/changelog-2024-02-27-1630-add-tiered-pricing-to-product-supplier.groovy b/.../migrations/0.9.x/changelog-2024-02-27-1630-add-tiered-pricing-to-product-supplier.groovy
@@ -0,0 +1,15 @@
+databaseChangeLog = {
+ changeSet(author: "openboxes (generated)", id: "1709054923255-0") {
+ preConditions(onError: "HALT", onFail: "MARK_RAN", onSqlOutput: "IGNORE") {
+ not {
+ columnExists(columnName: "tiered_pricing", tableName: "product_supplier")
+ }
+ }
+
+ addColumn(tableName: "product_supplier") {
+ column(name: "tiered_pricing", type: "bit") {
+ constraints(nullable: "false")
+ }
+ }
+ }
+}
diff --git a/grails-app/migrations/0.9.x/changelog.xml b/grails-app/migrations/0.9.x/changelog.xml
@@ -9,4 +9,5 @@
  <include file="0.9.x/changelog-2023-11-06-1230-add-missing-role-names.xml" />
  <include file="0.9.x/changelog-2024-01-10-1100-add-missing-foreign-keys-for-product-price.xml" />
  <include file="0.9.x/changelog-2024-02-22-1300-add-default-product-package-to-product-supplier.xml" />
+ <include file="0.9.x/changelog-2024-02-27-1630-add-tiered-pricing-to-product-supplier.groovy" />
 </databaseChangeLog>
diff --git a/grails-app/services/org/pih/warehouse/product/ProductPackageService.groovy b/grails-app/services/org/pih/warehouse/product/ProductPackageService.groovy
@@ -17,6 +17,7 @@ class ProductPackageService {
  private static void setPackageData(ProductPackageCommand command) {
  ProductSupplier productSupplier = command.productSupplier
  productSupplier.minOrderQuantity = command.minOrderQuantity
+ productSupplier.tieredPricing = command.tieredPricing
 
  ProductPackage defaultProductPackage = productSupplier?.productPackages?.find {
  it.uom == command.uom && it.quantity == command.productPackageQuantity

diff --git a/src/main/groovy/org/pih/warehouse/product/ProductPackageCommand.groovy b/src/main/groovy/org/pih/warehouse/product/ProductPackageCommand.groovy
@@ -22,6 +22,8 @@ class ProductPackageCommand implements Validateable {
 
  Date contractPriceValidUntil
 
+ Boolean tieredPricing = false
+
  static constraints = {
  productPackageQuantity(min: 0)
  minOrderQuantity(nullable: true, min: 0.0)