audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[ADD]pms_api_rest: datamodel payment info & add fields to invoice datamodel

Browse Source
This commit is contained in:
Darío Lodeiros
2022-11-03 09:37:41 +01:00
parent 82f6ab8483
commit 7a989e9d07
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pms_api_rest/services/pms_folio_service.py
View File

@@ -214,7 +214,7 @@ class PmsFolioService(Component):
"POST", "POST",
) )
], ],
input_param=Datamodel("pms.account.payment.info", is_list=False), input_param=Datamodel("pms.payment.info", is_list=False),
auth="jwt_api_pms", auth="jwt_api_pms",
) )
def create_folio_charge(self, folio_id, pms_account_payment_info): def create_folio_charge(self, folio_id, pms_account_payment_info):
@@ -223,13 +223,18 @@ class PmsFolioService(Component):
journal_id = self.env["account.journal"].browse( journal_id = self.env["account.journal"].browse(
pms_account_payment_info.journalId pms_account_payment_info.journalId
) )
reservations = (
self.env["pms.reservation"].browse(pms_account_payment_info.reservationIds)
if pms_account_payment_info.reservationIds
else False
)
self.env["pms.folio"].do_payment( self.env["pms.folio"].do_payment(
journal_id, journal_id,
journal_id.suspense_account_id, journal_id.suspense_account_id,
self.env.user, self.env.user,
pms_account_payment_info.amount, pms_account_payment_info.amount,
folio, folio,
reservations=pms_account_payment_info.reservationIds, reservations=reservations,
services=False, services=False,
partner=partner_id, partner=partner_id,
date=datetime.strptime(pms_account_payment_info.date, "%m/%d/%Y"), date=datetime.strptime(pms_account_payment_info.date, "%m/%d/%Y"),
@@ -244,7 +249,7 @@ class PmsFolioService(Component):
"POST", "POST",
) )
], ],
input_param=Datamodel("pms.account.payment.info", is_list=False), input_param=Datamodel("pms.payment.info", is_list=False),
auth="jwt_api_pms", auth="jwt_api_pms",
) )
def create_folio_refund(self, folio_id, pms_account_payment_info): def create_folio_refund(self, folio_id, pms_account_payment_info):
@@ -582,4 +587,13 @@ class PmsFolioService(Component):
lines_to_invoice=lines_to_invoice_dict, lines_to_invoice=lines_to_invoice_dict,
partner_invoice_id=invoice_info.partnerId, partner_invoice_id=invoice_info.partnerId,
) )
for item in invoice_info.saleLines:
if item.id in invoices.invoice_line_ids.mapped("folio_line_ids.id"):
invoice_line = invoices.invoice_line_ids.filtered(
lambda r: item.id in r.folio_line_ids.ids
)
invoice_line.write({"name": item.name})
if invoice_info.narration:
invoices.write({"narration": invoice_info.narration})
return invoices.ids return invoices.ids

13
pms_api_rest/services/pms_invoice_service.py
View File

@@ -62,6 +62,19 @@ class PmsInvoiceService(Component):
new_vals["invoice_line_ids"].append((1, line.id, line_values)) new_vals["invoice_line_ids"].append((1, line.id, line_values))
else: else:
new_vals["invoice_line_ids"].append((2, line.id)) new_vals["invoice_line_ids"].append((2, line.id))
for line_info in pms_invoice_info.moveLines:
if not line_info.id:
new_vals["invoice_line_ids"].append(
(
0,
0,
{
"name": line_info.name,
"quantity": line_info.quantity,
"sale_line_ids": [(6, 0, line_info.saleLineIds)],
},
)
)
if not new_vals: if not new_vals:
return invoice.id return invoice.id