Compare commits

..

No commits in common. "v0.3.2" and "v0.3.0" have entirely different histories.

15 changed files with 1290 additions and 1689 deletions

View File

@ -14,7 +14,7 @@ swagger:
--target=./api/auth \ --target=./api/auth \
--client-package=auth-client \ --client-package=auth-client \
--model-package=auth-models \ --model-package=auth-models \
--principal=app.User & --principal=app.User
# #
# generate auth0 # generate auth0
# #
@ -27,7 +27,7 @@ swagger:
--target=./api/auth0 \ --target=./api/auth0 \
--client-package=auth0-client \ --client-package=auth0-client \
--model-package=auth0-models \ --model-package=auth0-models \
--principal=app.User & --principal=app.User
# #
# generate blaze # generate blaze
# #
@ -40,7 +40,7 @@ swagger:
--target=./api/blaze \ --target=./api/blaze \
--client-package=blaze-client \ --client-package=blaze-client \
--model-package=blaze-models \ --model-package=blaze-models \
--principal=app.User & --principal=app.User
# #
# generate crm # generate crm
# #
@ -53,7 +53,7 @@ swagger:
--target=./api/crm \ --target=./api/crm \
--client-package=crm-client \ --client-package=crm-client \
--model-package=crm-models \ --model-package=crm-models \
--principal=app.User & --principal=app.User
# #
# generate devops # generate devops
# #
@ -66,7 +66,7 @@ swagger:
--target=./api/devops \ --target=./api/devops \
--client-package=devops-client \ --client-package=devops-client \
--model-package=devops-models \ --model-package=devops-models \
--principal=app.User & --principal=app.User
# #
# generate geo # generate geo
# #
@ -79,7 +79,7 @@ swagger:
--target=./api/geo \ --target=./api/geo \
--client-package=geo-client \ --client-package=geo-client \
--model-package=geo-models \ --model-package=geo-models \
--principal=app.User & --principal=app.User
# #
# generate gov-gw # generate gov-gw
# #
@ -92,7 +92,7 @@ swagger:
--target=./api/gov-gw \ --target=./api/gov-gw \
--client-package=gov-gw-client \ --client-package=gov-gw-client \
--model-package=gov-gw-models \ --model-package=gov-gw-models \
--principal=app.User & --principal=app.User
# #
# generate ledger # generate ledger
# #
@ -105,7 +105,7 @@ swagger:
--target=./api/ledger \ --target=./api/ledger \
--client-package=ledger-client \ --client-package=ledger-client \
--model-package=ledger-models \ --model-package=ledger-models \
--principal=app.User & --principal=app.User
# #
# generate metrc-gw # generate metrc-gw
# #
@ -118,7 +118,7 @@ swagger:
--target=./api/metrc-gw \ --target=./api/metrc-gw \
--client-package=metrc-gw-client \ --client-package=metrc-gw-client \
--model-package=metrc-gw-models \ --model-package=metrc-gw-models \
--principal=app.User & --principal=app.User
# #
# generate ops # generate ops
# #
@ -131,7 +131,7 @@ swagger:
--target=./api/ops \ --target=./api/ops \
--client-package=ops-client \ --client-package=ops-client \
--model-package=ops-models \ --model-package=ops-models \
--principal=app.User & --principal=app.User
# #
# generate pdf # generate pdf
# #
@ -144,7 +144,7 @@ swagger:
--target=./api/pdf \ --target=./api/pdf \
--client-package=pdf-client \ --client-package=pdf-client \
--model-package=pdf-models \ --model-package=pdf-models \
--principal=app.User & --principal=app.User
# #
# generate plex # generate plex
# #
@ -157,7 +157,7 @@ swagger:
--target=./api/plex \ --target=./api/plex \
--client-package=plex-client \ --client-package=plex-client \
--model-package=plex-models \ --model-package=plex-models \
--principal=app.User & --principal=app.User
# #
# generate regs # generate regs
# #
@ -170,7 +170,7 @@ swagger:
--target=./api/regs \ --target=./api/regs \
--client-package=regs-client \ --client-package=regs-client \
--model-package=regs-models \ --model-package=regs-models \
--principal=app.User & --principal=app.User
# #
# generate render # generate render
# #
@ -183,7 +183,7 @@ swagger:
--target=./api/render \ --target=./api/render \
--client-package=render-client \ --client-package=render-client \
--model-package=render-models \ --model-package=render-models \
--principal=app.User & --principal=app.User
# #
# generate sf-gate # generate sf-gate
# #
@ -196,7 +196,7 @@ swagger:
--target=./api/sf-gate \ --target=./api/sf-gate \
--client-package=sf-gate-client \ --client-package=sf-gate-client \
--model-package=sf-gate-models \ --model-package=sf-gate-models \
--principal=app.User & --principal=app.User
# #
# generate stash # generate stash
# #
@ -209,7 +209,7 @@ swagger:
--target=./api/stash \ --target=./api/stash \
--client-package=stash-client \ --client-package=stash-client \
--model-package=stash-models \ --model-package=stash-models \
--principal=app.User & --principal=app.User
# #
# generate vendor-gw # generate vendor-gw
# #
@ -222,7 +222,7 @@ swagger:
--target=./api/vendor-gw \ --target=./api/vendor-gw \
--client-package=vendor-gw-client \ --client-package=vendor-gw-client \
--model-package=vendor-gw-models \ --model-package=vendor-gw-models \
--principal=app.User & --principal=app.User
# #
# generate workflow # generate workflow
# #
@ -235,4 +235,4 @@ swagger:
--target=./api/workflow \ --target=./api/workflow \
--client-package=workflow-client \ --client-package=workflow-client \
--model-package=workflow-models \ --model-package=workflow-models \
--principal=app.User & --principal=app.User

View File

@ -134,9 +134,6 @@ type Place struct {
// sales tax rate // sales tax rate
SalesTaxRate *TaxRate `json:"SalesTaxRate,omitempty"` SalesTaxRate *TaxRate `json:"SalesTaxRate,omitempty"`
// Is this place that is split by county boundaries?
Split bool `json:"Split,omitempty"`
// State Code // State Code
StateCode string `json:"StateCode,omitempty"` StateCode string `json:"StateCode,omitempty"`

View File

@ -35,12 +35,6 @@ type Country struct {
// Contact // Contact
Contactid string `json:"contactid,omitempty"` Contactid string `json:"contactid,omitempty"`
// Created By User ID
Createdbyid string `json:"createdbyid,omitempty"`
// Created Date
Createddate string `json:"createddate,omitempty"`
// Enrollment Status // Enrollment Status
Enrollmentstatus string `json:"enrollmentstatus,omitempty"` Enrollmentstatus string `json:"enrollmentstatus,omitempty"`
@ -50,12 +44,6 @@ type Country struct {
// Interest // Interest
Interest float64 `json:"interest,omitempty"` Interest float64 `json:"interest,omitempty"`
// Last Modified By User ID
Lastmodifiedbyid string `json:"lastmodifiedbyid,omitempty"`
// Last Modified Date
Lastmodifieddate string `json:"lastmodifieddate,omitempty"`
// latitude // latitude
Latitude float64 `json:"latitude,omitempty"` Latitude float64 `json:"latitude,omitempty"`

View File

@ -38,12 +38,6 @@ type County struct {
// Country Taxnexus ID // Country Taxnexus ID
Countryid string `json:"countryid,omitempty"` Countryid string `json:"countryid,omitempty"`
// Created By User ID
Createdbyid string `json:"createdbyid,omitempty"`
// Created Date
Createddate string `json:"createddate,omitempty"`
// Enrollment Status // Enrollment Status
Enrollmentstatus string `json:"enrollmentstatus,omitempty"` Enrollmentstatus string `json:"enrollmentstatus,omitempty"`
@ -74,12 +68,6 @@ type County struct {
// Land Area // Land Area
Landarea int64 `json:"landarea,omitempty"` Landarea int64 `json:"landarea,omitempty"`
// Last Modified By User ID
Lastmodifiedbyid string `json:"lastmodifiedbyid,omitempty"`
// Last Modified Date
Lastmodifieddate string `json:"lastmodifieddate,omitempty"`
// latitude // latitude
Latitude float64 `json:"latitude,omitempty"` Latitude float64 `json:"latitude,omitempty"`

View File

@ -44,12 +44,6 @@ type Place struct {
// County // County
Countyid string `json:"countyid,omitempty"` Countyid string `json:"countyid,omitempty"`
// Created By User ID
Createdbyid string `json:"createdbyid,omitempty"`
// Created Date
Createddate string `json:"createddate,omitempty"`
// Enrollment Status // Enrollment Status
Enrollmentstatus string `json:"enrollmentstatus,omitempty"` Enrollmentstatus string `json:"enrollmentstatus,omitempty"`
@ -80,12 +74,6 @@ type Place struct {
// Land Area // Land Area
Landarea int64 `json:"landarea,omitempty"` Landarea int64 `json:"landarea,omitempty"`
// Last Modified By User ID
Lastmodifiedbyid string `json:"lastmodifiedbyid,omitempty"`
// Last Modified Date
Lastmodifieddate string `json:"lastmodifieddate,omitempty"`
// latitude // latitude
Latitude float64 `json:"latitude,omitempty"` Latitude float64 `json:"latitude,omitempty"`
@ -131,13 +119,7 @@ type Place struct {
// Rollup Revenue Not Taxable // Rollup Revenue Not Taxable
Revenuenottaxable float64 `json:"revenuenottaxable,omitempty"` Revenuenottaxable float64 `json:"revenuenottaxable,omitempty"`
// Split? // State
Split bool `json:"split,omitempty"`
// State Code
Statecode string `json:"statecode,omitempty"`
// State ID
Stateid string `json:"stateid,omitempty"` Stateid string `json:"stateid,omitempty"`
// Document Status // Document Status

View File

@ -38,12 +38,6 @@ type State struct {
// Country // Country
Contryid string `json:"contryid,omitempty"` Contryid string `json:"contryid,omitempty"`
// Created By User ID
Createdbyid string `json:"createdbyid,omitempty"`
// Created Date
Createddate string `json:"createddate,omitempty"`
// Division // Division
Division string `json:"division,omitempty"` Division string `json:"division,omitempty"`
@ -68,12 +62,6 @@ type State struct {
// Land Area // Land Area
Landarea int64 `json:"landarea,omitempty"` Landarea int64 `json:"landarea,omitempty"`
// Last Modified By User ID
Lastmodifiedbyid string `json:"lastmodifiedbyid,omitempty"`
// Last Modified Date
Lastmodifieddate string `json:"lastmodifieddate,omitempty"`
// latitude // latitude
Latitude float64 `json:"latitude,omitempty"` Latitude float64 `json:"latitude,omitempty"`

View File

@ -9,7 +9,7 @@ func InitForce(serviceAccountName string) *force.API {
sugar.Infof("app.initForce: 📥 %s", serviceAccountName) sugar.Infof("app.initForce: 📥 %s", serviceAccountName)
acct := GetServiceAccount(serviceAccountName) acct := GetServiceAccount(serviceAccountName)
theForce, err := force.Create( theForce, err := force.Create(
"v49.0", "v45.0",
acct.ClientID, acct.ClientID,
acct.ClientSecret, acct.ClientSecret,
acct.Username, acct.Username,

View File

@ -54,7 +54,6 @@ func UnMarshalPlace(s *geo_models.Place) *Place {
RevenueNet: s.RevenueNet, RevenueNet: s.RevenueNet,
RevenueNotTaxable: s.RevenueNotTaxable, RevenueNotTaxable: s.RevenueNotTaxable,
Revneuebase: s.RevenueBase, Revneuebase: s.RevenueBase,
Split: s.Split,
StateCode: s.StateCode, StateCode: s.StateCode,
StateID: s.StateID, StateID: s.StateID,
Status: s.Status, Status: s.Status,
@ -136,7 +135,6 @@ func (obj *Place) MarshalToSwagger() *geo_models.Place {
RevenueNet: obj.RevenueNet, RevenueNet: obj.RevenueNet,
RevenueNotTaxable: obj.RevenueNotTaxable, RevenueNotTaxable: obj.RevenueNotTaxable,
SalesTaxRate: salesTaxRate, SalesTaxRate: salesTaxRate,
Split: obj.Split,
StateID: obj.StateID, StateID: obj.StateID,
Status: obj.Status, Status: obj.Status,
Subtotal: obj.Subtotal, Subtotal: obj.Subtotal,

View File

@ -54,7 +54,6 @@ type Place struct {
RevenueNotTaxable float64 RevenueNotTaxable float64
Revneuebase float64 Revneuebase float64
SalesTaxRate *TaxRate SalesTaxRate *TaxRate
Split bool
StateCode string StateCode string
StateID string StateID string
Status string Status string

View File

@ -47,6 +47,8 @@ const countyGeocodeLength = 7
var maxTaxTypes = int64(2000) //nolint:gomnd // it's a var const var maxTaxTypes = int64(2000) //nolint:gomnd // it's a var const
// const cityGeocodeLength = 12
// InitConfig exports the config initialization func // InitConfig exports the config initialization func
func InitConfig(systemName string, initalLogLevel zapcore.Level) { func InitConfig(systemName string, initalLogLevel zapcore.Level) {
if configured { if configured {

View File

@ -2441,18 +2441,6 @@ definitions:
type: object type: object
Country: Country:
properties: properties:
createdbyid:
description: Created By User ID
type: string
createddate:
description: Created Date
type: string
lastmodifiedbyid:
description: Last Modified By User ID
type: string
lastmodifieddate:
description: Last Modified Date
type: string
accountid: accountid:
type: string type: string
ref: ref:
@ -2545,18 +2533,6 @@ definitions:
type: object type: object
County: County:
properties: properties:
createdbyid:
description: Created By User ID
type: string
createddate:
description: Created Date
type: string
lastmodifiedbyid:
description: Last Modified By User ID
type: string
lastmodifieddate:
description: Last Modified Date
type: string
accountid: accountid:
type: string type: string
templateid: templateid:
@ -3737,18 +3713,6 @@ definitions:
type: object type: object
Place: Place:
properties: properties:
createdbyid:
description: Created By User ID
type: string
createddate:
description: Created Date
type: string
lastmodifiedbyid:
description: Last Modified By User ID
type: string
lastmodifieddate:
description: Last Modified Date
type: string
accountid: accountid:
type: string type: string
latitude: latitude:
@ -3845,11 +3809,7 @@ definitions:
description: Rollup Revenue Not Taxable description: Rollup Revenue Not Taxable
type: number type: number
format: double format: double
split: stateId:
type: boolean
statecode:
type: string
stateid:
type: string type: string
status: status:
type: string type: string
@ -3926,18 +3886,6 @@ definitions:
type: object type: object
State: State:
properties: properties:
createdbyid:
description: Created By User ID
type: string
createddate:
description: Created Date
type: string
lastmodifiedbyid:
description: Last Modified By User ID
type: string
lastmodifieddate:
description: Last Modified Date
type: string
templateid: templateid:
type: string type: string
ref: ref:

View File

@ -9,7 +9,7 @@ info:
title: "vendor-gw-blaze" title: "vendor-gw-blaze"
description: description:
"Taxnexus Gateway Client API for Blaze.me Cannabis Management System" "Taxnexus Gateway Client API for Blaze.me Cannabis Management System"
host: "api.partners.blaze.me" host: "api.blaze.me"
basePath: "/api/v1" basePath: "/api/v1"
schemes: schemes:
- "https" - "https"
@ -960,8 +960,6 @@ definitions:
companyId: companyId:
example: 5c7e8c7b722ed607e61edb06 example: 5c7e8c7b722ed607e61edb06
type: string type: string
complianceId:
type: string
created: created:
example: 1553982501834 example: 1553982501834
type: number type: number
@ -1059,8 +1057,6 @@ definitions:
updated: updated:
example: false example: false
type: boolean type: boolean
wmCategory:
type: string
type: object type: object
categoryId: categoryId:
example: 5c9fe425e0faca07db94b986 example: 5c9fe425e0faca07db94b986
@ -1074,11 +1070,6 @@ definitions:
cbn: cbn:
example: 0 example: 0
type: number type: number
committedQuantities:
properties:
no_region:
type: number
type: object
companyId: companyId:
example: 5c7e8c7b722ed607e61edb06 example: 5c7e8c7b722ed607e61edb06
type: string type: string
@ -1112,8 +1103,6 @@ definitions:
dirty: dirty:
example: false example: false
type: boolean type: boolean
discountEnabled:
type: boolean
discountable: discountable:
example: true example: true
type: boolean type: boolean
@ -1141,14 +1130,6 @@ definitions:
importSrc: importSrc:
example: string example: string
type: string type: string
instock:
type: boolean
lastLeaflySyncStatus:
type: boolean
lastLeaflySyncTime:
type: number
lastWMSyncTime:
type: number
lowInventoryNotification: lowInventoryNotification:
example: false example: false
type: boolean type: boolean
@ -1200,8 +1181,6 @@ definitions:
active: active:
example: true example: true
type: boolean type: boolean
assignedPrice:
type: number
companyId: companyId:
example: 5c7e8c7b722ed607e61edb06 example: 5c7e8c7b722ed607e61edb06
type: string type: string
@ -1252,42 +1231,12 @@ definitions:
items: items:
type: string type: string
type: array type: array
producerAddress:
properties:
address:
type: string
addressLine2:
type: string
city:
type: string
companyId:
type: string
country:
type: string
created:
type: number
deleted:
type: boolean
id:
type: string
modified:
type: number
state:
type: string
updated:
type: boolean
zipCode:
type: string
pricingTemplateId: pricingTemplateId:
example: "" example: ""
type: string type: string
productSaleType: productSaleType:
example: Both example: Both
type: string type: string
productTagGroups:
items:
type: string
type: array
productType: productType:
example: REGULAR example: REGULAR
type: string type: string
@ -1340,143 +1289,6 @@ definitions:
reOrderLevel: reOrderLevel:
example: 0 example: 0
type: number type: number
secondaryVendorResult:
items:
type: object
properties:
id:
type: string
created:
type: number
modified:
type: number
deleted:
type: boolean
updated:
type: boolean
companyId:
type: string
active:
type: boolean
name:
type: string
phone:
type: string
email:
type: string
fax:
type: string
address:
properties:
id:
type: string
created:
type: number
modified:
type: number
deleted:
type: boolean
updated:
type: boolean
address:
type: string
city:
type: string
state:
type: string
zipCode:
type: string
addressLine2:
type: string
country:
type: string
type: "object"
description:
type: string
website:
type: string
firstName:
type: string
lastName:
type: string
notes:
type: array
items:
type: string
licenseNumber:
type: string
assets:
type: array
items:
type: string
backOrderEnabled:
type: boolean
licenseExpirationDate:
type: number
armsLengthType:
type: string
brands:
type: array
items:
type: string
qbVendorRef:
type: array
items:
type: string
additionalAddressList:
type: array
items:
type: string
credits:
type: number
relatedEntity:
type: boolean
vendorType:
type: string
companyLicenses:
type: array
items:
type: "object"
properties:
id:
type: string
created:
type: number
modified:
type: number
deleted:
type: boolean
updated:
type: boolean
companyType:
type: string
licenseType:
type: string
licenseNumber:
type: string
licenseExpirationDate:
type: number
toDefault:
type: boolean
createdBy:
type: string
defaultPaymentTerm:
type: string
toDefault:
type: boolean
vendorKey:
type: string
type: array
secondaryVendors:
items:
type: string
type: array
sellable:
type: boolean
sellableQuantities:
properties:
no_region:
type: number
shopId: shopId:
example: 5c9fe425e0faca07db94b970 example: 5c9fe425e0faca07db94b970
type: string type: string
@ -1520,8 +1332,6 @@ definitions:
deleted: deleted:
example: false example: false
type: boolean type: boolean
displayName:
type: string
dirty: dirty:
example: false example: false
type: boolean type: boolean
@ -1961,28 +1771,9 @@ definitions:
example: Lowell Herb Co / The Hacienda Co LLC example: Lowell Herb Co / The Hacienda Co LLC
type: string type: string
notes: notes:
type: array
items: items:
type: object type: string
properties: type: array
id:
type: string
created:
type: number
modified:
type: number
deleted:
type: boolean
updated:
type: boolean
writerId:
type: string
writerName:
type: string
message:
type: string
enableOnFleet:
type: boolean
phone: phone:
example: "" example: ""
type: string type: string

View File

@ -2093,9 +2093,6 @@ definitions:
SalesTaxRate: SalesTaxRate:
$ref: "#/definitions/TaxRate" $ref: "#/definitions/TaxRate"
type: object type: object
Split:
type: boolean
description: Is this place that is split by county boundaries?
StateID: StateID:
description: State description: State
type: string type: string

File diff suppressed because it is too large Load Diff

View File

@ -4045,18 +4045,6 @@ definitions:
type: object type: object
Country: Country:
properties: properties:
createdbyid:
description: Created By User ID
type: string
createddate:
description: Created Date
type: string
lastmodifiedbyid:
description: Last Modified By User ID
type: string
lastmodifieddate:
description: Last Modified Date
type: string
accountid: accountid:
description: Account description: Account
type: string type: string
@ -4163,18 +4151,6 @@ definitions:
type: object type: object
County: County:
properties: properties:
createdbyid:
description: Created By User ID
type: string
createddate:
description: Created Date
type: string
lastmodifiedbyid:
description: Last Modified By User ID
type: string
lastmodifieddate:
description: Last Modified Date
type: string
accountid: accountid:
description: Account description: Account
type: string type: string
@ -6474,18 +6450,6 @@ definitions:
type: object type: object
Place: Place:
properties: properties:
createdbyid:
description: Created By User ID
type: string
createddate:
description: Created Date
type: string
lastmodifiedbyid:
description: Last Modified By User ID
type: string
lastmodifieddate:
description: Last Modified Date
type: string
accountid: accountid:
description: Account description: Account
type: string type: string
@ -6595,14 +6559,8 @@ definitions:
description: Rollup Revenue Not Taxable description: Rollup Revenue Not Taxable
type: number type: number
format: double format: double
split:
type: boolean
description: Split?
statecode:
description: State Code
type: string
stateid: stateid:
description: State ID description: State
type: string type: string
status: status:
description: Document Status description: Document Status
@ -7623,18 +7581,6 @@ definitions:
type: object type: object
State: State:
properties: properties:
createdbyid:
description: Created By User ID
type: string
createddate:
description: Created Date
type: string
lastmodifiedbyid:
description: Last Modified By User ID
type: string
lastmodifieddate:
description: Last Modified Date
type: string
accountid: accountid:
description: Account description: Account
type: string type: string