simplifique/Vendaweb-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: simplifique:7bc186cbe2d6a2c55316905bf48e0fa616784017
Branches Tags
simplifique:main simplifique:develop
..
compare: simplifique:main
Branches Tags
simplifique:main simplifique:develop

8 Commits
7bc186cbe2 ... main

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
Details
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
Details
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
luis
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
Details 
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
4 changed files with 6 additions and 12 deletions
Expand all files Collapse all files

2
k8s/overlays/prod/deployment-image-digest-patch.yaml
View File

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

4
src/app/sales/cart-sales/cart-sales.component.ts
View File

@@ -2393,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;
@@ -2407,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;

8
src/app/sales/components/discount-order/discount-order.component.ts
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) {

4
src/app/sales/pages/dash-sales/dash-sales.component.html
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>