mirror of
https://github.com/OCA/pms.git
synced 2025-01-29 00:17:45 +02:00
[IMP] pms_api_rest: add cash register service
This commit is contained in:
committed by
Darío Lodeiros
parent
58ff6fe3d0
commit
f425d24ea2
@@ -52,6 +52,7 @@ from . import pms_account_payment_term
|
|||||||
|
|
||||||
from . import pms_room_closure_reason
|
from . import pms_room_closure_reason
|
||||||
from . import pms_report
|
from . import pms_report
|
||||||
|
from . import pms_cash_register
|
||||||
from . import pms_folio_sale_line
|
from . import pms_folio_sale_line
|
||||||
from . import pms_invoice_line
|
from . import pms_invoice_line
|
||||||
from . import pms_mail
|
from . import pms_mail
|
||||||
|
|||||||
17
pms_api_rest/datamodels/pms_cash_register.py
Normal file
17
pms_api_rest/datamodels/pms_cash_register.py
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
from marshmallow import fields
|
||||||
|
|
||||||
|
from odoo.addons.datamodel.core import Datamodel
|
||||||
|
|
||||||
|
|
||||||
|
class PmsCashRegisterInfo(Datamodel):
|
||||||
|
_name = "pms.cash.register.info"
|
||||||
|
id = fields.Integer(required=False, allow_none=True)
|
||||||
|
state = fields.String(required=False, allow_none=True)
|
||||||
|
userId = fields.Integer(required=False, allow_none=True)
|
||||||
|
balance = fields.Integer(required=False, allow_none=True)
|
||||||
|
dateTime = fields.String(required=False, allow_none=True)
|
||||||
|
|
||||||
|
|
||||||
|
class PmsCashRegisterSearchParam(Datamodel):
|
||||||
|
_name = "pms.cash.register.search.param"
|
||||||
|
journalId = fields.Integer(required=False, allow_none=True)
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
from datetime import datetime
|
from odoo.odoo import fields
|
||||||
|
from odoo.osv import expression
|
||||||
|
|
||||||
from odoo.addons.base_rest import restapi
|
from odoo.addons.base_rest import restapi
|
||||||
from odoo.addons.base_rest_datamodel.restapi import Datamodel
|
from odoo.addons.base_rest_datamodel.restapi import Datamodel
|
||||||
from odoo.addons.component.core import Component
|
from odoo.addons.component.core import Component
|
||||||
from odoo.odoo import fields
|
|
||||||
from odoo.osv import expression
|
|
||||||
|
|
||||||
|
|
||||||
class PmsAccountPaymentService(Component):
|
class PmsAccountPaymentService(Component):
|
||||||
@@ -27,7 +27,7 @@ class PmsAccountPaymentService(Component):
|
|||||||
)
|
)
|
||||||
def get_payments(self, pms_payments_search_param):
|
def get_payments(self, pms_payments_search_param):
|
||||||
result_payments = []
|
result_payments = []
|
||||||
domain_fields = [("state","=","posted")]
|
domain_fields = [("state", "=", "posted")]
|
||||||
available_journals = ()
|
available_journals = ()
|
||||||
if pms_payments_search_param.pmsPropertyId:
|
if pms_payments_search_param.pmsPropertyId:
|
||||||
available_journals = self.env["account.journal"].search(
|
available_journals = self.env["account.journal"].search(
|
||||||
@@ -38,7 +38,7 @@ class PmsAccountPaymentService(Component):
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
domain_fields.append(("journal_id", "in", available_journals.ids))
|
domain_fields.append(("journal_id", "in", available_journals.ids))
|
||||||
domain_filter=list()
|
domain_filter = list()
|
||||||
if pms_payments_search_param.filter:
|
if pms_payments_search_param.filter:
|
||||||
# TODO: filter by folio and invoice
|
# TODO: filter by folio and invoice
|
||||||
for search in pms_payments_search_param.filter.split(" "):
|
for search in pms_payments_search_param.filter.split(" "):
|
||||||
@@ -52,13 +52,17 @@ class PmsAccountPaymentService(Component):
|
|||||||
if pms_payments_search_param.dateStart and pms_payments_search_param.dateEnd:
|
if pms_payments_search_param.dateStart and pms_payments_search_param.dateEnd:
|
||||||
date_from = fields.Date.from_string(pms_payments_search_param.dateStart)
|
date_from = fields.Date.from_string(pms_payments_search_param.dateStart)
|
||||||
date_to = fields.Date.from_string(pms_payments_search_param.dateEnd)
|
date_to = fields.Date.from_string(pms_payments_search_param.dateEnd)
|
||||||
domain_fields.extend([
|
domain_fields.extend(
|
||||||
"&",
|
[
|
||||||
("date", ">=", date_from),
|
"&",
|
||||||
("date", "<", date_to),
|
("date", ">=", date_from),
|
||||||
])
|
("date", "<", date_to),
|
||||||
|
]
|
||||||
|
)
|
||||||
if pms_payments_search_param.paymentMethodId:
|
if pms_payments_search_param.paymentMethodId:
|
||||||
domain_fields.append(("journal_id","=",pms_payments_search_param.paymentMethodId))
|
domain_fields.append(
|
||||||
|
("journal_id", "=", pms_payments_search_param.paymentMethodId)
|
||||||
|
)
|
||||||
# TODO: payment tyope filter (partner_type, payment_type, is_transfer)
|
# TODO: payment tyope filter (partner_type, payment_type, is_transfer)
|
||||||
if domain_filter:
|
if domain_filter:
|
||||||
domain = expression.AND([domain_fields, domain_filter[0]])
|
domain = expression.AND([domain_fields, domain_filter[0]])
|
||||||
@@ -70,15 +74,17 @@ class PmsAccountPaymentService(Component):
|
|||||||
|
|
||||||
total_payments = self.env["account.payment"].search_count(domain)
|
total_payments = self.env["account.payment"].search_count(domain)
|
||||||
group_payments = self.env["account.payment"].read_group(
|
group_payments = self.env["account.payment"].read_group(
|
||||||
domain=domain,
|
domain=domain, fields=["amount:sum"], groupby=["payment_type"]
|
||||||
fields=["amount:sum"],
|
|
||||||
groupby=["payment_type"]
|
|
||||||
)
|
)
|
||||||
amount_result = 0
|
amount_result = 0
|
||||||
if group_payments:
|
if group_payments:
|
||||||
for item in group_payments:
|
for item in group_payments:
|
||||||
total_inbound = item["amount"] if item["payment_type"] == "inbound" else 0
|
total_inbound = (
|
||||||
total_outbound = item["amount"] if item["payment_type"] == "outbound" else 0
|
item["amount"] if item["payment_type"] == "inbound" else 0
|
||||||
|
)
|
||||||
|
total_outbound = (
|
||||||
|
item["amount"] if item["payment_type"] == "outbound" else 0
|
||||||
|
)
|
||||||
amount_result = total_inbound - total_outbound
|
amount_result = total_inbound - total_outbound
|
||||||
for payment in self.env["account.payment"].search(
|
for payment in self.env["account.payment"].search(
|
||||||
domain,
|
domain,
|
||||||
@@ -91,16 +97,10 @@ class PmsAccountPaymentService(Component):
|
|||||||
id=payment.id,
|
id=payment.id,
|
||||||
name=payment.name if payment.name else None,
|
name=payment.name if payment.name else None,
|
||||||
amount=payment.amount,
|
amount=payment.amount,
|
||||||
journalId=payment.journal_id.id
|
journalId=payment.journal_id.id if payment.journal_id else None,
|
||||||
if payment.journal_id
|
|
||||||
else None,
|
|
||||||
date=payment.date.strftime("%d/%m/%Y"),
|
date=payment.date.strftime("%d/%m/%Y"),
|
||||||
partnerId = payment.partner_id.id
|
partnerId=payment.partner_id.id if payment.partner_id else None,
|
||||||
if payment.partner_id
|
partnerName=payment.partner_id.name if payment.partner_id else None,
|
||||||
else None,
|
|
||||||
partnerName = payment.partner_id.name
|
|
||||||
if payment.partner_id
|
|
||||||
else None,
|
|
||||||
paymentType=payment.payment_type,
|
paymentType=payment.payment_type,
|
||||||
partnerType=payment.partner_type,
|
partnerType=payment.partner_type,
|
||||||
isTransfer=payment.is_internal_transfer,
|
isTransfer=payment.is_internal_transfer,
|
||||||
@@ -109,4 +109,44 @@ class PmsAccountPaymentService(Component):
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
return PmsPaymentResults(payments=result_payments, total=amount_result, totalPayments=total_payments)
|
return PmsPaymentResults(
|
||||||
|
payments=result_payments, total=amount_result, totalPayments=total_payments
|
||||||
|
)
|
||||||
|
|
||||||
|
@restapi.method(
|
||||||
|
[
|
||||||
|
(
|
||||||
|
[
|
||||||
|
"/cash-register",
|
||||||
|
],
|
||||||
|
"GET",
|
||||||
|
)
|
||||||
|
],
|
||||||
|
input_param=Datamodel("pms.cash.register.search.param", is_list=False),
|
||||||
|
output_param=Datamodel("pms.cash.register.info", is_list=False),
|
||||||
|
auth="jwt_api_pms",
|
||||||
|
)
|
||||||
|
def get_cash_register(self, cash_register_search_param):
|
||||||
|
statement = (
|
||||||
|
self.env["account.bank.statement"]
|
||||||
|
.sudo()
|
||||||
|
.search(
|
||||||
|
[
|
||||||
|
("journal_id", "=", cash_register_search_param.journalId),
|
||||||
|
],
|
||||||
|
limit=1,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
CashRegister = self.env.datamodels["pms.cash.register.info"]
|
||||||
|
if not statement:
|
||||||
|
return CashRegister()
|
||||||
|
isOpen = True if statement.state == "open" else False
|
||||||
|
return CashRegister(
|
||||||
|
state="open" if isOpen else "close",
|
||||||
|
userId=statement.user_id.id,
|
||||||
|
balance=statement.balance_start if isOpen else statement.balance_end_real,
|
||||||
|
dateTime=statement.create_date.strftime("%d/%m/%Y")
|
||||||
|
if isOpen
|
||||||
|
else statement.date_done.strftime("%d/%m/%Y"),
|
||||||
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user