joelson
/
vendaweb-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix: resolve merge conflict in calculateDeliveryTaxOrder
Deploy NestJS API / build-and-push-deploy (push) Failing after 26s Details

This commit is contained in:
JuruSysadmin 2026-01-13 12:57:22 -03:00
parent 73c460d87b
commit 70f35270ad
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/sales/sales/sales.service.ts
View File

@ -1505,17 +1505,7 @@ export class SalesService {
} }
async calculateDeliveryTaxOrder(dataDeliveryTax: any) { async calculateDeliveryTaxOrder(dataDeliveryTax: any) {
<<<<<<< HEAD
let cityId = await this.customerService.findCity(dataDeliveryTax.ibgeCode);
=======
console.log("json dataDeliveryTax", dataDeliveryTax); console.log("json dataDeliveryTax", dataDeliveryTax);
/*const dataDeliveryTax = {
cartId: cartId,
cityId: cityId,
ibgeCode: ibgeCode,
priorityDelivery: priorityDelivery,
};*/
let cityId = 0; let cityId = 0;
if (dataDeliveryTax.ibgeCode) { if (dataDeliveryTax.ibgeCode) {
@ -1523,7 +1513,6 @@ export class SalesService {
} else { } else {
cityId = dataDeliveryTax.cityId; cityId = dataDeliveryTax.cityId;
} }
>>>>>>> feat/painel-cliente
await this.updatePriorityDelivery(dataDeliveryTax.cartId, dataDeliveryTax.priorityDelivery); await this.updatePriorityDelivery(dataDeliveryTax.cartId, dataDeliveryTax.priorityDelivery);
if (cityId == 0) { if (cityId == 0) {