Compare commits

...

11 Commits

Author SHA1 Message Date
Gitea Action
e89895b07b chore: update image tag to c366a55 [skip ci] 2026-04-01 18:19:30 +00:00
Luis Eduardo Estevao
c366a55c15 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 10m16s
2026-04-01 15:08:59 -03:00
Luis Eduardo Estevao
afd6b453d7 feat: create dashboard sales layout with responsive navigation and pre-order modal 2026-04-01 15:08:52 -03:00
Gitea Action
eee589174e chore: update image tag to 47945c9 [skip ci] 2026-03-16 18:02:03 +00:00
Luis Eduardo Estevao
47945c9b54 feat: Add discount order component to manage order discounts with authorization logic.
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 13m59s
2026-03-16 14:47:57 -03:00
Gitea Action
1c5652dae6 chore: update image tag to 1f5ab7b [skip ci] 2026-02-24 23:12:32 +00:00
1f5ab7b133 Merge pull request 'fix: update cart sales print viewer urls' (#1) from develop into main
All checks were successful
Build (develop) / Promote (main) / build-and-push-deploy (push) Successful in 5m45s
Reviewed-on: #1
2026-02-24 18:06:47 -05:00
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
5 changed files with 20 additions and 13 deletions

View File

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

View File

@@ -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"

View File

@@ -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;

View File

@@ -84,15 +84,9 @@ export class DiscountOrderComponent implements OnInit, OnDestroy {
} }
confirmDiscount() { confirmDiscount() {
const domain = '@jurunense.com.br';
let email = this.formDiscount.get('formUser.email').value; let email = this.formDiscount.get('formUser.email').value;
// Remover domínio se já estiver presente const emailUpperCase = email.toUpperCase();
if (email.toLowerCase().endsWith(domain)) {
email = email.substring(0, email.length - domain.length);
}
const emailUpperCase = (email + domain).toUpperCase();
const passwordUpperCase = this.formDiscount.get('formUser.password').value.toUpperCase(); const passwordUpperCase = this.formDiscount.get('formUser.password').value.toUpperCase();
if (this.discountAuthorization < this.percent) { if (this.discountAuthorization < this.percent) {

View File

@@ -40,8 +40,8 @@
</button> </button>
<div *ngIf="isMobileMenuOpen" class="mobile-menu-items shadow-sm"> <div *ngIf="isMobileMenuOpen" class="mobile-menu-items shadow-sm">
<button class="dropdown-item w-100" (click)="openNewOrder()">Novo pedido</button> <button class="dropdown-item w-100" (click)="openNewOrder()">Novo pedido</button>
<button class="dropdown-item w-100" (click)="openDashTodaysale()">Dashboard Venda dia</button> <!-- <button class="dropdown-item w-100" (click)="openDashTodaysale()">Dashboard Venda dia</button>
<button class="dropdown-item w-100" (click)="openDashSeller()">Dashboard Vendedor</button> <button class="dropdown-item w-100" (click)="openDashSeller()">Dashboard Vendedor</button>-->
<button class="dropdown-item w-100" (click)="openOrders()">Pedidos de venda</button> <button class="dropdown-item w-100" (click)="openOrders()">Pedidos de venda</button>
<button class="dropdown-item w-100" (click)="openProductOrder()">Produtos Vendidos</button> <button class="dropdown-item w-100" (click)="openProductOrder()">Produtos Vendidos</button>
<button class="dropdown-item w-100" (click)="openClose(true)">Orçamentos pendentes</button> <button class="dropdown-item w-100" (click)="openClose(true)">Orçamentos pendentes</button>