Compare commits

..

5 Commits

Author SHA1 Message Date
joelson
769af04587 fix: update cart sales print viewer urls 2026-02-23 09:14:26 -03:00
Gitea Action
7bc186cbe2 chore: update image tag to b8cda80 [skip ci] 2026-02-20 13:11:29 +00:00
Luis Eduardo Estevao
b8cda807ef Merge branch 'main' of https://git.simplifiquehc.com.br/simplifique/Vendaweb-portal
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 5m59s
2026-02-20 10:04:51 -03:00
Luis Eduardo Estevao
8bf7331837 feat: implement new shopping cart sales component with responsive Kendo UI grid for item display and management. 2026-02-20 10:04:44 -03:00
Gitea Action
1a26b75cb0 chore: update image tag to de46ca8 [skip ci] 2026-02-19 13:18:38 +00:00
3 changed files with 17 additions and 4 deletions

View File

@@ -7,4 +7,4 @@ spec:
spec:
containers:
- name: portal
image: 172.35.0.216:3000/simplifique/vendaweb-portal:f300dc0
image: 172.35.0.216:3000/simplifique/vendaweb-portal:b8cda80

View File

@@ -849,10 +849,19 @@
<div class="col-12 col-sm-6 p-0 mt-3 mt-sm-0">
<div class="row w-100 m-0 p-0 d-flex justify-content-between">
<div class="col-6 p-1">
<button kendoButton class="btn-pre-order w-100" [disabled]="isLoadingPreOrder"
<!-- <button kendoButton class="btn-pre-order w-100" [disabled]="isLoadingPreOrder"
[icon]="loadingIconPreOrder" (click)="showConfirmation()">
<span *ngIf="!isLoadingPreOrder" class="text-btn-order">Fechar orçamento</span>
</button> -->
<button *ngIf="!isLoadingPreOrder" kendoButton class="btn-order w-100"
(click)="showConfirmation()" [disabled]="isLoadingPreOrder" [icon]="loadingIconOrder">
<span class="text-btn-order">Fechar orçamento</span>
</button>
<kendo-loader *ngIf="isLoadingPreOrder" size="small"></kendo-loader>
</div>
<div class="col-6 p-1">
<button *ngIf="!isLoadingOrder" kendoButton class="btn-order w-100"

View File

@@ -65,6 +65,7 @@ import { OrderDiscount } from '../store/models/order-discount.model';
import { SaleState } from '../store/models/sale-state.model';
import { ShoppingItem } from '../store/models/shopping-item';
import { Shopping } from '../store/models/shopping.model';
import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
export interface JsonModel {
shippingDate: string;
@@ -700,6 +701,7 @@ export class CartSalesComponent
}
async showConfirmation() {
this.isLoadingPreOrder = true;
const dialog: DialogRef = this.dialogService.open({
title: 'Por favor, confirme',
content: 'Deseja gravar como orçamento ?',
@@ -715,6 +717,7 @@ export class CartSalesComponent
dialog.result.subscribe((result) => {
if (result instanceof DialogCloseResult) {
console.log('close');
this.isLoadingPreOrder = false;
} else {
const resultConfirmation = JSON.stringify(result);
console.log('action1', resultConfirmation);
@@ -722,6 +725,7 @@ export class CartSalesComponent
console.log('criando orçamento');
this.createPreOrder();
}
this.isLoadingPreOrder = false;
}
});
}
@@ -2389,7 +2393,7 @@ export class CartSalesComponent
openPrintPreOrder() {
// this.urlPrintPreOrder = 'http://localhost:52986//Viewer/{action}?order=' +
this.urlPrintPreOrder =
'http://172.35.0.219:8068/Viewer/{action}?order=' +
'https://portainer.simplifiquehc.com.br/Viewer/{action}?order=' +
this.preOrderNumber +
'&model=' +
this.modelPrintPreOrder;
@@ -2403,7 +2407,7 @@ export class CartSalesComponent
openPrintOrder() {
// this.urlPrintPreOrder = 'http://localhost:52986//Viewer/{action}?order=' +
this.urlPrintOrder =
'http://172.35.0.219:8068/Viewer/{action}?orderId=' +
'https://portainer.simplifiquehc.com.br/Viewer/{action}?orderId=' +
this.orderNumber +
'&model=' +
this.modelPrintOrder;