Merge branch 'master' of github.com:erajayatech/hermes

Author: rifki

model/sales_item_bundling.go

@@ -8,6 +8,7 @@ type SalesItemBundling struct {
 	Sku                string    `json:"sku"`
 	Name               string    `json:"name"`
 	Price              int64     `json:"price"`
+	PriceFormated      string    `json:"price_formated"`
 	Fixed              string    `json:"fixed"`
 	Qty                int64     `json:"qty"`
 	DiscountAmount     int64     `json:"discount_amount"`

model/sales_merchant.go

@@ -5,6 +5,7 @@ import "time"
 type SalesMerchant struct {
 	ID                             int64     `json:"id"`
 	OrderID                        int64     `json:"order_id"`
+	OrderNumberOms                 string    `json:"order_number_oms"`
 	MerchantCode                   string    `json:"merchant_code"`
 	MerchantName                   string    `json:"merchant_name"`
 	MerchantShippingTitle          string    `json:"merchant_shipping_title"`

model/sales_order.go

@@ -12,6 +12,7 @@ type SalesOrder struct {
 	IsRefunded                     int                   `json:"is_refunded"`
 	HoldBeforeStatus               string                `json:"hold_before_status"`
 	Source                         string                `json:"source"`
+	OrderType                      string                `json:"order_type"`
 	IsVirtual                      int                   `json:"is_virtual"`
 	CustomerID                     int64                 `json:"customer_id"`
 	CustomerGroupID                int                   `json:"customer_group_id"`
@@ -85,11 +86,15 @@ type SalesOrder struct {
 	OrderExpired                   time.Time             `json:"order_expired"`
 	DiscountCrmOtpcode             string                `json:"discount_crm_otpcode"`
 	DiscountCrmVouchercode         string                `json:"discount_crm_vouchercode"`
+	OrderTimes                     string                `json:"order_times"`
+	Entity                         string                `json:"entity"`
+	SessionInfo                    string                `json:"session_info" gorm:"column:session_info"`
 }
 
 type SalesOrderItemGroup struct {
 	ID                             int64            `json:"id"`
 	OrderID                        int64            `json:"order_id"`
+	OrderNumberOms                 string           `json:"order_number_oms"`
 	MerchantCode                   string           `json:"merchant_code"`
 	MerchantName                   string           `json:"merchant_name"`
 	MerchantShippingTitle          string           `json:"merchant_shipping_title"`

model/sales_order_item.go

@@ -21,6 +21,8 @@ type SalesOrderItem struct {
 	DiscountInternalAmount         int64                `json:"discount_internal_amount"`
 	DiscountInternalAmountFormated string               `json:"discount_internal_amount_formated"`
 	DiscountInternalJson           string               `json:"discount_internal_json"`
+	TotalPrice                     int64                `json:"total_price"`
+	TotalPriceFormated             string               `json:"total_price_formated"`
 	OrderItemBundlingID            int64                `json:"order_item_bundling_id"`
 	ImageUrl                       string               `json:"image_url"`
 	OriginalPrice                  int64                `json:"original_price"`

model/sales_shipment.go

@@ -6,8 +6,8 @@ type SalesShipment struct {
 	ID                  int64     `json:"id"`
 	OrderID             int64     `json:"order_id"`
 	CustomerID          int64     `json:"customer_id"`
-	SalesMerchantID		int64	  `json:"sales_merchant_id"`
-	SalesMerchantCode   string	  `json:"sales_merchant_code"`
+	SalesMerchantID     int64     `json:"sales_merchant_id"`
+	SalesMerchantCode   string    `json:"sales_merchant_code"`
 	AwbNumber           string    `json:"awb_number"`
 	ShippingMethodCode  string    `json:"shipping_method_code"`
 	ShippingMethodTitle string    `json:"shipping_method_title"`