Merge branch 'main' of https://git.simplifiquehc.com.br/simplifique/Vendaweb-api

src/backoffice/lists/lists.controller.ts

@@ -44,9 +44,9 @@ export class ListsController {
     /**
     * Consulta tabela de plano de pagamento para pedido de venda
     */
-    @Get('paymentplan/:billindid')
+    @Get('paymentplan/:billindid/:customerId')
-        async getPaymentPlan(@Param('billindid') billingId: string) {
+    async getPaymentPlan(@Param('billindid') billingId: string, @Param('customerId') customerId: string) {
-        return this.listsServices.GetPaymentPlan(billingId);
+        return this.listsServices.GetPaymentPlan(billingId, customerId);
     }
 
     /**

src/backoffice/lists/lists.service.ts

@@ -102,20 +102,24 @@ export class ListsService {
         }
     }
 
-    async GetPaymentPlan(billingId: string){
+    async GetPaymentPlan(billingId: string, clientId: string) {
         const connection = new Connection(connectionOptions);
         await connection.connect();
         const queryRunner = connection.createQueryRunner();
         await queryRunner.connect();
         try {
-            const sql = '  SELECT PCPLPAG.CODPLPAG as "codplpag", PCPLPAG.DESCRICAO as "descricao",  ' +
+            const sql = `SELECT PCPLPAG.CODPLPAG as "codplpag", PCPLPAG.DESCRICAO as "descricao",  
-                        '         NVL(PCPLPAG.NUMDIAS,0) as "numdias" ' +
+                                NVL(PCPLPAG.NUMDIAS,0) as "numdias" 
-                        '    FROM PCPLPAG  ' +     
+                           FROM PCPLPAG, PCCLIENT, PCPLPAG PLANO_CLI   
-                        '    WHERE EXISTS(SELECT PCCOBPLPAG.CODCOB FROM PCCOBPLPAG ' +
+                          WHERE PCCLIENT.CODCLI = :CODCLI
-                        '                  WHERE PCCOBPLPAG.CODPLPAG = PCPLPAG.CODPLPAG ' + 
+                            AND PCCLIENT.CODPLPAG = PLANO_CLI.CODPLPAG (+)
-                        '                   AND PCCOBPLPAG.CODCOB = :CODCOB ) '
+                            AND PCPLPAG.NUMDIAS <= NVL(PLANO_CLI.NUMDIAS,9999) 
-                        '  ORDER BY PCPAG.DESCRICAO ';
+                            AND EXISTS(SELECT PCCOBPLPAG.CODCOB FROM PCCOBPLPAG 
-            const paymentPlans = await queryRunner.query(sql, [billingId]);
+                                                    WHERE PCCOBPLPAG.CODPLPAG = PCPLPAG.CODPLPAG 
+                                                                AND PCCOBPLPAG.CODCOB = :CODCOB ) 
+                          ORDER BY PCPLPAG.DESCRICAO`;
+
+            const paymentPlans = await queryRunner.query(sql, [clientId, billingId]);
             return paymentPlans;
         } catch (error) {
             throw error;
@@ -135,7 +139,7 @@ export class ListsService {
                 '   FROM PCCOB ' +
                 '  WHERE NVL(PCCOB.enviacobrancafv, \'N\') = \'S\'  ' +
                 '               AND ( ( NOT EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI  ) AND  ' +
-                        '                   ( PCCOB.NIVELVENDA <= ( SELECT C.NIVELVENDA FROM PCCLIENT, PCCOB C ' +
+                '                   ( PCCOB.NIVELVENDA >= ( SELECT C.NIVELVENDA FROM PCCLIENT, PCCOB C ' +
                 '                                            WHERE PCCLIENT.CODCLI = :CODCLI AND PCCLIENT.CODCOB = C.CODCOB ) ) ) OR ' +
                 '                      EXISTS(SELECT PCCOBCLI.CODCOB FROM PCCOBCLI WHERE PCCOBCLI.CODCLI = :CODCLI AND PCCOBCLI.CODCOB = PCCOB.CODCOB ) ) ' +
                 ' ORDER BY PCCOB.CODCOB';

src/sales/customer/customer.service.ts

@@ -469,9 +469,9 @@ export class CustomerService {
     async InitializeCustomer() {
         const cliente = new Pcclient();
         cliente.codusur1 = 1;
-        cliente.codplpag = 10;
+        cliente.codplpag = 18;
-        cliente.codpraca = 119;
+        cliente.codpraca = 169;
-        cliente.codcob = "D";
+        cliente.codcob = "CAR";
         cliente.dtcadastro = new Date();
         cliente.codcontab = "1";
         cliente.aceitavendafracao = "N";
@@ -502,7 +502,7 @@ export class CustomerService {
         cliente.tv10usacustoproduto = "N";
         cliente.inscestadual = "ISENTO";
         cliente.codpais = 1058; //Brasil 
-        cliente.observacao = "Importado do E-Commerce";
+        cliente.observacao = "Cadastrado Venda Web";
         cliente.aceitachterceiros = "S";
         cliente.agregarvalorstdescfin = "N";
         cliente.anvisa = "N";

src/sales/order/order.service.ts

@@ -954,7 +954,7 @@ export class OrderService {
             const partners = await this.listsService.GetPartners();
             const address = await this.addressCustomerService.getAddress(order[0].customerId, order[0].addressId);
             const billing = billinds.find(data => data.codcob === order[0].billindId);
-            const paymentPlans = await this.listsService.GetPaymentPlan(billing.codcob);
+            const paymentPlans = await this.listsService.GetPaymentPlan(billing.codcob, order[0].customerId);
             const paymentPlan = paymentPlans.find(data => data.codplpag === order[0].paymentPlanId);
             const partner = partners.find(data => data.id === order[0].partnerId);
 

src/sales/pre-order/pre-order.service.ts

@@ -425,7 +425,7 @@ export class PreOrderService {
             }
             // const address = await this.addressCustomerService.getAddress(preOrder[0].customerId, preOrder[0].addressId);
             const billing = billinds.find(data => data.codcob === preOrder[0].billindId);
-            const paymentPlans = await this.listsService.GetPaymentPlan((billing !== null && billing !== undefined) ? billing.codcob : '9999');
+            const paymentPlans = await this.listsService.GetPaymentPlan((billing !== null && billing !== undefined) ? billing.codcob : '9999', preOrder[0].customerId);
             const paymentPlan = paymentPlans.find(data => data.codplpag === preOrder[0].paymentPlanId);
             const partner = partners.find(data => data.id === preOrder[0].partnerId);