moved item's gst % to item not its variantv0.23.0

3 files changed, 9 insertions, 9 deletions

diff --git a/item/item.go b/item/item.go
index 05ca8f6..f161f78 100644
--- a/item/item.go
+++ b/item/item.go
@@ -40,7 +40,6 @@ type ItemVariant struct {
 	SavedItemID     uint   `gorm:"index"`
 	VariantName     string // "red color", "large size", "red color large size", etc
 	UnitPrice       string // float
-	GSTPercentage   string // float
 	QuantityInStock string // float
 }
 
@@ -52,5 +51,6 @@ type SavedItem struct {
 	Description   string
 	HSN           string
 	UnitOfMeasure string
+	GSTPercentage string // float
 	Variants      []ItemVariant
 }
diff --git a/item/validators.go b/item/validators.go
index 3541acb..1fba170 100644
--- a/item/validators.go
+++ b/item/validators.go
@@ -31,6 +31,13 @@ func (i *SavedItem) validate() error {
 	i.Description = strings.TrimSpace(i.Description)
 	i.HSN = strings.TrimSpace(i.HSN)
 	i.UnitOfMeasure = strings.TrimSpace(i.UnitOfMeasure)
+	i.GSTPercentage = strings.TrimSpace(i.GSTPercentage)
+
+	// check if GSTPercentage is float
+	_, err := strconv.ParseFloat(i.GSTPercentage, 64)
+	if err != nil && i.GSTPercentage != "" {
+		return errors.ErrInvalidGSTPercentage
+	}
 
 	if len(i.Variants) == 0 {
 		return errors.ErrNoItemVariants
@@ -54,7 +61,6 @@ func (i *SavedItem) validate() error {
 func (v *ItemVariant) validate() error {
 	v.VariantName = strings.TrimSpace(v.VariantName)
 	v.UnitPrice = strings.TrimSpace(v.UnitPrice)
-	v.GSTPercentage = strings.TrimSpace(v.GSTPercentage)
 	v.QuantityInStock = strings.TrimSpace(v.QuantityInStock)
 
 	var err error
@@ -65,12 +71,6 @@ func (v *ItemVariant) validate() error {
 		return errors.ErrInvalidUnitPrice
 	}
 
-	// check if GSTPercentage is float
-	_, err = strconv.ParseFloat(v.GSTPercentage, 64)
-	if err != nil && v.GSTPercentage != "" {
-		return errors.ErrInvalidGSTPercentage
-	}
-
 	// check if QuantityInStock is float
 	_, err = strconv.ParseFloat(v.QuantityInStock, 64)
 	if err != nil && v.QuantityInStock != "" {
diff --git a/main.go b/main.go
index 4538dfe..6a4e938 100644
--- a/main.go
+++ b/main.go
@@ -38,7 +38,7 @@ import (
 	"log"
 )
 
-const OPENBILLS_VERSION = "v0.22.0"
+const OPENBILLS_VERSION = "v0.23.0"
 
 func init() {
 	if !viper.GetBool("debug_mode") {