Merge pull request #14 from husennasrullah/master

zidni722 · web-flow · commit a87e6fe5bf9f · 2024-01-10T11:24:38.000+07:00
add field emeterai in salesMerchant struct
diff --git a/model/sales_merchant.go b/model/sales_merchant.go
@@ -12,6 +12,7 @@ type SalesMerchant struct {
 	MerchantShippingCode           string    `json:"merchant_shipping_code"`
 	MerchantShippingAmount         int64     `json:"merchant_shipping_amount"`
 	MerchantShippingAmountFormated string    `json:"merchant_shipping_amount_formated"`
+	EmeteraiAmount                 int64     `json:"emeterai_amount"`
 	CreatedAt                      time.Time `json:"created_at"`
 	UpdatedAt                      time.Time `json:"updated_at"`
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ type SalesMerchant struct {`
`12`	`12`	MerchantShippingCode string `json:"merchant_shipping_code"`
`13`	`13`	MerchantShippingAmount int64 `json:"merchant_shipping_amount"`
`14`	`14`	MerchantShippingAmountFormated string `json:"merchant_shipping_amount_formated"`
	`15`	+ EmeteraiAmount int64 `json:"emeterai_amount"`
`15`	`16`	CreatedAt time.Time `json:"created_at"`
`16`	`17`	UpdatedAt time.Time `json:"updated_at"`
`17`	`18`	`}`