added ffl address to order

go.mod

@@ -6,6 +6,6 @@ require (
 	github.com/Ulbora/Level_Logger v1.0.2
 	github.com/Ulbora/dbinterface v1.0.5
 	github.com/Ulbora/dbinterface_mysql v1.0.7
-	github.com/Ulbora/six910-database-interface v1.1.1
+	github.com/Ulbora/six910-database-interface v1.1.2
 	github.com/go-sql-driver/mysql v1.6.0 // indirect
 )

go.sum

@@ -70,6 +70,8 @@ github.com/Ulbora/six910-database-interface v1.1.0 h1:JjJKWsEfDu/Heq6wYnKYg0LZTq
 github.com/Ulbora/six910-database-interface v1.1.0/go.mod h1:xKoESfGA7CV8kFeZwMtwnBAezrBFzTdtrSRaeUn0QBQ=
 github.com/Ulbora/six910-database-interface v1.1.1 h1:LSCAw1d+SJnahx/aAltl+VDxUlmR15yaH5++GDxtsMk=
 github.com/Ulbora/six910-database-interface v1.1.1/go.mod h1:xKoESfGA7CV8kFeZwMtwnBAezrBFzTdtrSRaeUn0QBQ=
+github.com/Ulbora/six910-database-interface v1.1.2 h1:aQx2e/0iJnz196f+B4VGd/VnZUQ0Tyb132g+gTKN/ZI=
+github.com/Ulbora/six910-database-interface v1.1.2/go.mod h1:xKoESfGA7CV8kFeZwMtwnBAezrBFzTdtrSRaeUn0QBQ=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=

order.go

@@ -38,7 +38,7 @@ func (d *Six910Mysql) AddOrder(o *mdb.Order) (bool, int64) {
 	a = append(a, time.Now(), o.Status, o.Subtotal, o.ShippingHandling, o.Insurance, o.Taxes, o.Total,
 		o.CustomerID, o.BillingAddressID, o.ShippingAddressID, o.CustomerName, o.BillingAddress,
 		o.ShippingAddress, o.StoreID, o.OrderNumber, o.OrderType, o.Pickup, o.Username,
-		o.ShippingMethodID, o.ShippingMethodName)
+		o.ShippingMethodID, o.ShippingMethodName, o.FFLShippingAddressID, o.FFLShippingAddress)
 	suc, id := d.DB.Insert(insertOrder, a...)
 	d.Log.Debug("suc in add Order", suc)
 	d.Log.Debug("id in add Order", id)
@@ -54,7 +54,7 @@ func (d *Six910Mysql) UpdateOrder(o *mdb.Order) bool {
 	a = append(a, time.Now(), o.Status, o.Subtotal, o.ShippingHandling, o.Insurance, o.Taxes, o.Total,
 		o.BillingAddressID, o.ShippingAddressID, o.CustomerName, o.BillingAddress,
 		o.ShippingAddress, o.OrderType, o.Pickup, o.Username, o.ShippingMethodID, o.ShippingMethodName,
-		o.Refunded, o.ID)
+		o.Refunded, o.FFLShippingAddressID, o.FFLShippingAddress, o.ID)
 	suc := d.DB.Update(updateOrder, a...)
 	return suc
 }
@@ -253,6 +253,8 @@ func (d *Six910Mysql) parseOrderRow(foundRow *[]string) *mdb.Order {
 															refunded, err := strconv.ParseFloat((*foundRow)[22], 64)
 															d.Log.Debug("refunded err in get Order", err)
 															if err == nil {
+																fflid, _ := strconv.ParseInt((*foundRow)[23], 10, 64)
+																d.Log.Debug("smid err in get Order", err)
 																rtn.ID = id
 																rtn.CustomerID = cid
 																rtn.OrderDate = oTime
@@ -267,6 +269,7 @@ func (d *Six910Mysql) parseOrderRow(foundRow *[]string) *mdb.Order {
 																rtn.Taxes = tax
 																rtn.Total = tot
 																rtn.Refunded = refunded
+																rtn.FFLShippingAddressID = fflid
 																rtn.Status = (*foundRow)[3]
 																rtn.CustomerName = (*foundRow)[12]
 																rtn.BillingAddress = (*foundRow)[13]
@@ -276,6 +279,7 @@ func (d *Six910Mysql) parseOrderRow(foundRow *[]string) *mdb.Order {
 																rtn.Username = (*foundRow)[19]
 																rtn.ShippingMethodID = smid
 																rtn.ShippingMethodName = (*foundRow)[21]
+																rtn.FFLShippingAddress = (*foundRow)[24]
 															}
 
 														}

order_test.go

@@ -71,6 +71,8 @@ func TestSix910Mysql_Order(t *testing.T) {
 	odr.Taxes = 5.27
 	odr.Total = 146.32
 	odr.Username = "billybob"
+	odr.FFLShippingAddressID = 21
+	odr.FFLShippingAddress = "My FFL"
 
 	dbi.Close()
 	odrsuc, oid := si.AddOrder(&odr)
@@ -100,6 +102,8 @@ func TestSix910Mysql_Order(t *testing.T) {
 	odr.ShippingMethodID = 23
 	odr.ShippingMethodName = "UPS Ground"
 	odr.Refunded = 15.00
+	odr.FFLShippingAddressID = 22
+	odr.FFLShippingAddress = "My New FFL"
 
 	dbi.Close()
 	uodrsuc := si.UpdateOrder(&odr)
@@ -110,6 +114,8 @@ func TestSix910Mysql_Order(t *testing.T) {
 	dbi.Close()
 	fodr := si.GetOrder(oid)
 	fmt.Println("fodr: ", fodr)
+	fmt.Println("fodr fflid: ", fodr.FFLShippingAddressID)
+	fmt.Println("fodr ffl: ", fodr.FFLShippingAddress)
 	fmt.Println("Refunded: ", fodr.Refunded)
 	if fodr.CustomerID != odr.CustomerID || fodr.OrderType != odr.OrderType || fodr.Refunded != 15.00 {
 		t.Fail()
@@ -170,4 +176,5 @@ func TestSix910Mysql_Order(t *testing.T) {
 	}
 
 	dbi.Close()
+	// t.Fail()
 }

queries.go

@@ -643,42 +643,43 @@ const (
 	insertOrder = "INSERT INTO orders (order_date, status, subtotal, shipping_handling, " +
 		" insurance, taxes, total, customer_id, billing_address_id, shipping_address_id, customer_name, " +
 		" billing_address, shipping_address, store_id, order_number, order_type, pickup, username, " +
-		" shipping_method_id, shipping_method_name)" +
-		" values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) "
+		" shipping_method_id, shipping_method_name, ffl_address_id, ffl_address)" +
+		" values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) "
 
 	updateOrder = "UPDATE orders SET updated = ?, status = ?, subtotal = ?, shipping_handling = ?, " +
 		" insurance = ?, taxes = ?, total = ?, billing_address_id = ?, shipping_address_id = ?, customer_name = ?, " +
 		" billing_address = ?, shipping_address = ?, order_type = ?, pickup = ?, username = ?, " +
-		" shipping_method_id = ?, shipping_method_name = ?, refunded = ? " +
+		" shipping_method_id = ?, shipping_method_name = ?, refunded = ?, ffl_address_id = ?, " +
+		" ffl_address = ? " +
 		" WHERE id = ? "
 
 	getOrder = "SELECT id, order_date, updated, status, subtotal, shipping_handling, " +
 		" insurance, taxes, total, customer_id, billing_address_id, shipping_address_id, customer_name, " +
 		" billing_address, shipping_address, store_id, order_number, order_type, pickup, username, " +
-		" shipping_method_id, shipping_method_name, refunded " +
+		" shipping_method_id, shipping_method_name, refunded, ffl_address_id, ffl_address " +
 		" FROM orders " +
 		" WHERE id = ? "
 
 	getOrderByCid = "SELECT id, order_date, updated, status, subtotal, shipping_handling, " +
 		" insurance, taxes, total, customer_id, billing_address_id, shipping_address_id, customer_name, " +
 		" billing_address, shipping_address, store_id, order_number, order_type, pickup, username, " +
-		" shipping_method_id, shipping_method_name, refunded " +
+		" shipping_method_id, shipping_method_name, refunded, ffl_address_id, ffl_address " +
 		" FROM orders " +
 		" WHERE customer_id = ? and store_id = ? " +
 		" ORDER BY order_date "
 
 	getOrderForStore = "SELECT id, order_date, updated, status, subtotal, shipping_handling, " +
 		" insurance, taxes, total, customer_id, billing_address_id, shipping_address_id, customer_name, " +
 		" billing_address, shipping_address, store_id, order_number, order_type, pickup, username, " +
-		" shipping_method_id, shipping_method_name, refunded " +
+		" shipping_method_id, shipping_method_name, refunded, ffl_address_id, ffl_address " +
 		" FROM orders " +
 		" WHERE store_id = ? " +
 		" ORDER by status"
 
 	getOrderForStoreByStatus = "SELECT id, order_date, updated, status, subtotal, shipping_handling, " +
 		" insurance, taxes, total, customer_id, billing_address_id, shipping_address_id, customer_name, " +
 		" billing_address, shipping_address, store_id, order_number, order_type, pickup, username, " +
-		" shipping_method_id, shipping_method_name, refunded " +
+		" shipping_method_id, shipping_method_name, refunded, ffl_address_id, ffl_address " +
 		" FROM orders " +
 		" WHERE store_id = ? and status = ? "