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

[REF] pms-api-rest: fix nested roues & add plurals

Browse Source
This commit is contained in:
miguelpadin
2022-06-22 09:54:13 +02:00
committed by Darío Lodeiros
parent dcc414b85a
commit bf1d52a09f
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pms_api_rest/services/pms_availability_plan_service.py
View File

@@ -68,7 +68,7 @@ class PmsAvailabilityPlanService(Component):
[ [
( (
[ [
"/<int:availability_plan>/rules", "/<int:availability_plan>/availability-plan-rules",
], ],
"GET", "GET",
) )
@@ -142,7 +142,7 @@ class PmsAvailabilityPlanService(Component):
[ [
( (
[ [
"/<int:availability_plan_id>/availability-plan-rule", "/<int:availability_plan_id>/availability-plan-rules",
], ],
"POST", "POST",
) )
@@ -186,7 +186,7 @@ class PmsAvailabilityPlanService(Component):
[ [
( (
[ [
"/<int:availability_plan_id>/availability-plan-rule/", "/<int:availability_plan_id>/availability-plan-rules/<int:availability_plan_rule_id>",
], ],
"PATCH", "PATCH",
) )
@@ -195,13 +195,14 @@ class PmsAvailabilityPlanService(Component):
auth="jwt_api_pms", auth="jwt_api_pms",
) )
def write_availability_plan_rule( def write_availability_plan_rule(
self, availability_plan_id, pms_avail_plan_rule_info self, availability_plan_id, availability_plan_rule_id, pms_avail_plan_rule_info
): ):
vals = dict() vals = dict()
avail_rule = self.env["pms.availability.plan.rule"].search( avail_rule = self.env["pms.availability.plan.rule"].search(
[ [
("id", "=", pms_avail_plan_rule_info.availabilityRuleId),
("availability_plan_id", "=", availability_plan_id), ("availability_plan_id", "=", availability_plan_id),
("id", "=", availability_plan_rule_id),
] ]
) )
if avail_rule: if avail_rule:

18
pms_api_rest/services/pms_pricelist_service.py
View File

@@ -69,7 +69,7 @@ class PmsPricelistService(Component):
[ [
( (
[ [
"/<int:pricelist_id>", "/<int:pricelist_id>/pricelist-items",
], ],
"GET", "GET",
) )
@@ -128,10 +128,9 @@ class PmsPricelistService(Component):
), ),
) )
if item: pricelist_info.pricelistItemId = item.id
pricelist_info.pricelistItemId = item.id price = re.findall(r"[+-]?\d+\.\d+", item.price)
price = re.findall(r"[+-]?\d+\.\d+", item.price) pricelist_info.price = float(price[0])
pricelist_info.price = float(price[0])
result.append(pricelist_info) result.append(pricelist_info)
@@ -141,7 +140,7 @@ class PmsPricelistService(Component):
[ [
( (
[ [
"/<int:pricelist_id>/pricelist-item", "/<int:pricelist_id>/pricelist-items",
], ],
"POST", "POST",
) )
@@ -176,7 +175,7 @@ class PmsPricelistService(Component):
[ [
( (
[ [
"/<int:pricelist_id>/pricelist-item", "/<int:pricelist_id>/pricelist-items/<int:pricelist_item_id>",
], ],
"PATCH", "PATCH",
) )
@@ -184,11 +183,12 @@ class PmsPricelistService(Component):
input_param=Datamodel("pms.pricelist.item.info", is_list=False), input_param=Datamodel("pms.pricelist.item.info", is_list=False),
auth="jwt_api_pms", auth="jwt_api_pms",
) )
def write_pricelist_item(self, pricelist_id, pms_pricelist_item_info): def write_pricelist_item(self, pricelist_id, pricelist_item_id, pms_pricelist_item_info):
product_pricelist_item = self.env["product.pricelist.item"].search( product_pricelist_item = self.env["product.pricelist.item"].search(
[ [
("id", "=", pms_pricelist_item_info.pricelistItemId),
("pricelist_id", "=", pricelist_id), ("pricelist_id", "=", pricelist_id),
("id", "=", pricelist_item_id),
] ]
) )
if product_pricelist_item and pms_pricelist_item_info.price: if product_pricelist_item and pms_pricelist_item_info.price: