Compare commits
8 Commits
f300dc07d1
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
769af04587 | ||
|
|
7bc186cbe2 | ||
|
|
b8cda807ef | ||
|
|
8bf7331837 | ||
|
|
1a26b75cb0 | ||
|
|
de46ca882d | ||
|
|
e464c54c97 | ||
|
|
6292312e1d |
@@ -7,4 +7,4 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: portal
|
- name: portal
|
||||||
image: 172.35.0.216:3000/simplifique/vendaweb-portal:f04f5f5
|
image: 172.35.0.216:3000/simplifique/vendaweb-portal:b8cda80
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<div class="container d-flex justify-content-between align-items-center py-3">
|
<div class="container d-flex justify-content-between align-items-center py-3">
|
||||||
<!-- Logo à esquerda -->
|
<!-- Logo à esquerda -->
|
||||||
<div class="logo-jurunense">
|
<div class="logo-jurunense">
|
||||||
<a href="/#/menu" title="Simplifique">
|
<a href="/#/sales/menu" title="Simplifique">
|
||||||
<img src="assets/img/logo_simplifique.png" alt="Imagem" class="img-fluid" />
|
<img src="assets/img/logo_simplifique.png" alt="Imagem" class="img-fluid" />
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<div class="container d-flex justify-content-between align-items-center py-3">
|
<div class="container d-flex justify-content-between align-items-center py-3">
|
||||||
<!-- Logo -->
|
<!-- Logo -->
|
||||||
<div class="logo-jurunense">
|
<div class="logo-jurunense">
|
||||||
<a href="/#/menu" title="Simplifique">
|
<a href="/#/sales/menu" title="Simplifique">
|
||||||
<img src="assets/img/logo_simplifique.png" alt="Logo Simplifique" class="img-fluid" />
|
<img src="assets/img/logo_simplifique.png" alt="Logo Simplifique" class="img-fluid" />
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -849,10 +849,19 @@
|
|||||||
<div class="col-12 col-sm-6 p-0 mt-3 mt-sm-0">
|
<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="row w-100 m-0 p-0 d-flex justify-content-between">
|
||||||
<div class="col-6 p-1">
|
<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()">
|
[icon]="loadingIconPreOrder" (click)="showConfirmation()">
|
||||||
<span *ngIf="!isLoadingPreOrder" class="text-btn-order">Fechar orçamento</span>
|
<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>
|
</button>
|
||||||
|
<kendo-loader *ngIf="isLoadingPreOrder" size="small"></kendo-loader>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-6 p-1">
|
<div class="col-6 p-1">
|
||||||
<button *ngIf="!isLoadingOrder" kendoButton class="btn-order w-100"
|
<button *ngIf="!isLoadingOrder" kendoButton class="btn-order w-100"
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ import { OrderDiscount } from '../store/models/order-discount.model';
|
|||||||
import { SaleState } from '../store/models/sale-state.model';
|
import { SaleState } from '../store/models/sale-state.model';
|
||||||
import { ShoppingItem } from '../store/models/shopping-item';
|
import { ShoppingItem } from '../store/models/shopping-item';
|
||||||
import { Shopping } from '../store/models/shopping.model';
|
import { Shopping } from '../store/models/shopping.model';
|
||||||
|
import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
|
||||||
|
|
||||||
export interface JsonModel {
|
export interface JsonModel {
|
||||||
shippingDate: string;
|
shippingDate: string;
|
||||||
@@ -700,6 +701,7 @@ export class CartSalesComponent
|
|||||||
}
|
}
|
||||||
|
|
||||||
async showConfirmation() {
|
async showConfirmation() {
|
||||||
|
this.isLoadingPreOrder = true;
|
||||||
const dialog: DialogRef = this.dialogService.open({
|
const dialog: DialogRef = this.dialogService.open({
|
||||||
title: 'Por favor, confirme',
|
title: 'Por favor, confirme',
|
||||||
content: 'Deseja gravar como orçamento ?',
|
content: 'Deseja gravar como orçamento ?',
|
||||||
@@ -715,6 +717,7 @@ export class CartSalesComponent
|
|||||||
dialog.result.subscribe((result) => {
|
dialog.result.subscribe((result) => {
|
||||||
if (result instanceof DialogCloseResult) {
|
if (result instanceof DialogCloseResult) {
|
||||||
console.log('close');
|
console.log('close');
|
||||||
|
this.isLoadingPreOrder = false;
|
||||||
} else {
|
} else {
|
||||||
const resultConfirmation = JSON.stringify(result);
|
const resultConfirmation = JSON.stringify(result);
|
||||||
console.log('action1', resultConfirmation);
|
console.log('action1', resultConfirmation);
|
||||||
@@ -722,6 +725,7 @@ export class CartSalesComponent
|
|||||||
console.log('criando orçamento');
|
console.log('criando orçamento');
|
||||||
this.createPreOrder();
|
this.createPreOrder();
|
||||||
}
|
}
|
||||||
|
this.isLoadingPreOrder = false;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -2389,7 +2393,7 @@ export class CartSalesComponent
|
|||||||
openPrintPreOrder() {
|
openPrintPreOrder() {
|
||||||
// this.urlPrintPreOrder = 'http://localhost:52986//Viewer/{action}?order=' +
|
// this.urlPrintPreOrder = 'http://localhost:52986//Viewer/{action}?order=' +
|
||||||
this.urlPrintPreOrder =
|
this.urlPrintPreOrder =
|
||||||
'http://172.35.0.219:8068/Viewer/{action}?order=' +
|
'https://portainer.simplifiquehc.com.br/Viewer/{action}?order=' +
|
||||||
this.preOrderNumber +
|
this.preOrderNumber +
|
||||||
'&model=' +
|
'&model=' +
|
||||||
this.modelPrintPreOrder;
|
this.modelPrintPreOrder;
|
||||||
@@ -2403,7 +2407,7 @@ export class CartSalesComponent
|
|||||||
openPrintOrder() {
|
openPrintOrder() {
|
||||||
// this.urlPrintPreOrder = 'http://localhost:52986//Viewer/{action}?order=' +
|
// this.urlPrintPreOrder = 'http://localhost:52986//Viewer/{action}?order=' +
|
||||||
this.urlPrintOrder =
|
this.urlPrintOrder =
|
||||||
'http://172.35.0.219:8068/Viewer/{action}?orderId=' +
|
'https://portainer.simplifiquehc.com.br/Viewer/{action}?orderId=' +
|
||||||
this.orderNumber +
|
this.orderNumber +
|
||||||
'&model=' +
|
'&model=' +
|
||||||
this.modelPrintOrder;
|
this.modelPrintOrder;
|
||||||
|
|||||||
Reference in New Issue
Block a user