diff --git a/QBClass/QBClasses.py b/QBClass/QBClasses.py index 04f0fab..54329ad 100644 --- a/QBClass/QBClasses.py +++ b/QBClass/QBClasses.py @@ -628,7 +628,8 @@ class TransactionQuery(baseQBQuery): self.QBDict[self.classNameRq]["TransactionDateRangeFilter"]={'FromTxnDate':kwargs.get('TransactionDateRangeFilter_FromTxnDate', ""), 'ToTxnDate':kwargs.get('TransactionDateRangeFilter_ToTxnDate', "")} elif 'TransactionDateRangeFilter_DateMacro' in kwargs: self.QBDict[self.classNameRq]["TransactionDateRangeFilter"]={'DateMacro':kwargs['TransactionDateRangeFilter_DateMacro']} - + + # if 'TransactionEntityFilter_EntityTypeFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionEntityFilter"]={'EntityTypeFilter':kwargs['TransactionEntityFilter_EntityTypeFilter']} elif 'TransactionEntityFilter_ListID' in kwargs: @@ -639,7 +640,8 @@ class TransactionQuery(baseQBQuery): self.QBDict[self.classNameRq]["TransactionEntityFilter"]={'ListIDWithChildren':kwargs['TransactionEntityFilter_ListIDWithChildren']} elif 'TransactionEntityFilter_FullNameWithChildren' in kwargs: self.QBDict[self.classNameRq]["TransactionEntityFilter"]={'FullNameWithChildren':kwargs['TransactionEntityFilter_FullNameWithChildren']} - + + # if 'TransactionAccountFilter_AccountTypeFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionAccountFilter"]={'AccountTypeFilter':kwargs['TransactionAccountFilter_AccountTypeFilter']} elif 'TransactionAccountFilter_ListID' in kwargs: @@ -651,6 +653,7 @@ class TransactionQuery(baseQBQuery): elif 'TransactionAccountFilter_FullNameWithChildren' in kwargs: self.QBDict[self.classNameRq]["TransactionAccountFilter"]={'FullNameWithChildren':kwargs['TransactionAccountFilter_FullNameWithChildren']} + # if 'TransactionItemFilter_ItemTypeFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionItemFilter"]={'ItemTypeFilter':kwargs['TransactionItemFilter_ItemTypeFilter']} elif 'TransactionItemFilter_ListID' in kwargs: @@ -661,7 +664,7 @@ class TransactionQuery(baseQBQuery): self.QBDict[self.classNameRq]["TransactionItemFilter"]={'ListIDWithChildren':kwargs['TransactionItemFilter_ListIDWithChildren']} elif 'TransactionItemFilter_FullNameWithChildren' in kwargs: self.QBDict[self.classNameRq]["TransactionItemFilter"]={'FullNameWithChildren':kwargs['TransactionItemFilter_FullNameWithChildren']} - + if 'TransactionClassFilter_ListID' in kwargs: self.QBDict[self.classNameRq]["TransactionClassFilter"]={'ListID':kwargs['TransactionClassFilter_ListID']} elif 'TransactionClassFilter_FullName' in kwargs: @@ -670,16 +673,20 @@ class TransactionQuery(baseQBQuery): self.QBDict[self.classNameRq]["TransactionClassFilter"]={'ListIDWithChildren':kwargs['TransactionClassFilter_ListIDWithChildren']} elif 'TransactionClassFilter_FullNameWithChildren' in kwargs: self.QBDict[self.classNameRq]["TransactionClassFilter"]={'FullNameWithChildren':kwargs['TransactionClassFilter_FullNameWithChildren']} - + + # if 'TransactionTypeFilter_TxnTypeFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionTypeFilter"]={'TxnTypeFilter':kwargs['TransactionTypeFilter_TxnTypeFilter']} - + + # if 'TransactionDetailLevelFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionDetailLevelFilter"]=kwargs['TransactionDetailLevelFilter'] + # if 'TransactionPostingStatusFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionPostingStatusFilter"]=kwargs['TransactionPostingStatusFilter'] - + + # if 'TransactionPaidStatusFilter' in kwargs: self.QBDict[self.classNameRq]["TransactionPaidStatusFilter"]=kwargs['TransactionPaidStatusFilter'] @@ -945,8 +952,8 @@ class SalesOrderAdd(baseQBQuery): elif 'PriceLevelRef_FullName' in eachLineAdd: self.LineAddDict["PriceLevelRef"]={'FullName': eachLineAdd['PriceLevelRef_FullName']} - if 'Amount' in eachLineAdd: - self.LineAddDict["Amount"]=eachLineAdd['Amount'] + if 'Amount ' in eachLineAdd: + self.LineAddDict["Amount "]=eachLineAdd['Amount '] # Others if 'Other1' in eachLineAdd: self.LineAddDict["Other1"]=eachLineAdd['Other1'] @@ -1205,7 +1212,7 @@ def InventoryStockStatusByVendor(ReportEntityFilter_FullName:str='TACO') -> dict ND=coldata['@value'] #Next Delivery Date dt[FullName]={'ShortName':ShortName, 'QOH':QOH, 'QOSO':QOSO, 'QA':QA, 'QOPO':QOPO, 'UOM':UOM, 'min':min, 'max':max, 'ND':ND} # print(f'{dt = }') - # print(len(dt)) + print(f'InventoryStockStatusByVendor {len(dt) = }') return dt """ {'@rowNumber': '1016', diff --git a/main.py b/main.py index eb91492..15a249c 100644 --- a/main.py +++ b/main.py @@ -18,7 +18,7 @@ import pdfexcel4DNwithxlrd from ItemInventoryQuery import ItemInventoryQuery from SO_to_Inv import readSO, CustomerQuery import os -from QBClass.QBClasses import SalesOrderAdd, InventoryStockStatusByVendor, PriceLevelQuery +from QBClass.QBClasses import SalesOrderAdd, InventoryStockStatusByVendor, PriceLevelQuery, TransactionQuery from QBClass.QBClasses import CustomerQuery as CQ import pprint @@ -297,3 +297,20 @@ async def salesorderadd(request: Request): return so.all() +@app.post('/dasa2/transactionquery') +async def transactionquery(request: Request): + transactiondict = await request.body() + print("") + try: + transactiondict = json.loads(transactiondict) + except: + print('error TransactionQuery()') + return {'message':'error getting TransactionQuery Data. it is not json'} + print(f'{type(transactiondict)}, {transactiondict = }') + print(f'{transactiondict = }') + tq = TransactionQuery(**transactiondict) + print(tq.all()) + print(f'{len(tq.to_json()) = }') + return tq.all() + +