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

src/app/partners/home/partners.component.html

@@ -4,17 +4,11 @@
       <h4>FILTRO DE PARCEIROS</h4>
       <label>
         <span>CPF</span>
-        <kendo-textbox
+        <kendo-textbox formControlName="cpf" placeholder="Informe o CPF do parceiro"></kendo-textbox>
-          formControlName="cpf"
-          placeholder="Informe o CPF do parceiro"
-        ></kendo-textbox>
       </label>
       <label class="mt-2">
         <span>Nome</span>
-        <kendo-textbox
+        <kendo-textbox formControlName="name" placeholder="Informe o nome do parceiro"></kendo-textbox>
-          formControlName="name"
-          placeholder="Informe o nome do parceiro"
-        ></kendo-textbox>
       </label>
 
       <div class="row mt-2">
@@ -23,72 +17,34 @@
         </div>
         <div class="col-sm-12 col-md-4 col-lg-2">
           <label>
-            <input
+            <input type="radio" name="type" value="P" #other formControlName="type" kendoRadioButton />
-              type="radio"
-              name="type"
-              value="P"
-              #other
-              formControlName="type"
-              kendoRadioButton
-            />
             <span class="in-line">Parceiros</span>
           </label>
         </div>
         <div class="col-sm-12 col-md-4 col-lg-2">
           <label>
-            <input
+            <input type="radio" name="type" value="B" #other formControlName="type" kendoRadioButton />
-              type="radio"
-              name="type"
-              value="B"
-              #other
-              formControlName="type"
-              kendoRadioButton
-            />
             <span class="in-line">Bella Obra</span>
           </label>
         </div>
         <div class="col-sm-12 col-md-4 col-lg-3">
           <label>
-            <input
+            <input type="radio" name="type" value="M" #other formControlName="type" kendoRadioButton />
-              type="radio"
+            <span class="in-line">Mestre Simplifique</span>
-              name="type"
-              value="M"
-              #other
-              formControlName="type"
-              kendoRadioButton
-            />
-            <span class="in-line">Mestre Jurunense</span>
           </label>
         </div>
         <div class="col-sm-12 col-md-4 col-lg-2">
           <label>
-            <input
+            <input type="radio" name="type" value="T" #other formControlName="type" kendoRadioButton />
-              type="radio"
-              name="type"
-              value="T"
-              #other
-              formControlName="type"
-              kendoRadioButton
-            />
             <span class="in-line">Todos</span>
           </label>
         </div>
       </div>
       <div class="mt-3 row-buttons">
-        <button
+        <button kendoButton rounded="medium" themeColor="primary" (click)="getPartners()">
-          kendoButton
-          rounded="medium"
-          themeColor="primary"
-          (click)="getPartners()"
-        >
           Pesquisar
         </button>
-        <button
+        <button kendoButton rounded="medium" themeColor="waring" (click)="open()">
-          kendoButton
-          rounded="medium"
-          themeColor="waring"
-          (click)="open()"
-        >
           Incluir
         </button>
       </div>
@@ -96,15 +52,8 @@
   </div>
 
   <main class="flex-fill">
-    <kendo-grid
+    <kendo-grid [kendoGridBinding]="gridView" class="gridPartners" (edit)="editPartner($event)" [sortable]="true"
-      [kendoGridBinding]="gridView"
+      [reorderable]="true" [resizable]="true" [columnMenu]="{ filter: true }">
-      class="gridPartners"
-      (edit)="editPartner($event)"
-      [sortable]="true"
-      [reorderable]="true"
-      [resizable]="true"
-      [columnMenu]="{ filter: true }"
-    >
       <kendo-grid-column title="Código" field="id" width="80">
       </kendo-grid-column>
       <kendo-grid-column title="Tipo Parceiro" field="type" width="150">
@@ -115,11 +64,7 @@
       </kendo-grid-column>
       <kendo-grid-column title="Nome" field="name" width="250">
       </kendo-grid-column>
-      <kendo-grid-column
+      <kendo-grid-column title="Telefone" field="phone" width="100"></kendo-grid-column>
-        title="Telefone"
-        field="phone"
-        width="100"
-      ></kendo-grid-column>
 
       <kendo-grid-column title="Data Cadastro" field="createDate" width="100">
         <ng-template kendoGridCellTemplate let-dataItem>
@@ -163,25 +108,13 @@
   </main>
 </div>
 
-<kendo-window
+<kendo-window *ngIf="opened" autoFocusedElement="#cpf" title="CADASTRO DE PROFISSIONAL" (close)="close()"
-  *ngIf="opened"
+  [minWidth]="250" [width]="650" [height]="650">
-  autoFocusedElement="#cpf"
-  title="CADASTRO DE PROFISSIONAL"
-  (close)="close()"
-  [minWidth]="250"
-  [width]="650"
-  [height]="650"
->
   <form class="k-form" [formGroup]="formPartner">
     <kendo-formfield>
       <label>
         <span>CPF</span>
-        <kendo-textbox
+        <kendo-textbox formControlName="cpf" [clearButton]="true" #cpf (blur)="searchPartner()"></kendo-textbox>
-          formControlName="cpf"
-          [clearButton]="true"
-          #cpf
-          (blur)="searchPartner()"
-        ></kendo-textbox>
       </label>
       <kendo-formerror>Error: CPF é obrigatório</kendo-formerror>
     </kendo-formfield>
@@ -189,12 +122,7 @@
     <kendo-formfield>
       <label>
         <span>Nome</span>
-        <input
+        <input class="inputText" formControlName="name" #fullName kendoTextBox />
-          class="inputText"
-          formControlName="name"
-          #fullName
-          kendoTextBox
-        />
       </label>
       <kendo-formerror>Error: Nome é obrigatório</kendo-formerror>
     </kendo-formfield>
@@ -204,78 +132,43 @@
       <ul class="k-radio-list">
         <li class="k-radio-item">
           <label>
-            <input
+            <input type="radio" #mestre value="B" kendoRadioButton formControlName="type"
-              type="radio"
+              (change)="filterCategory('B')" />
-              #mestre
-              value="B"
-              kendoRadioButton
-              formControlName="type"
-              (change)="filterCategory('B')"
-            />
             <span> Bella Obra</span>
           </label>
         </li>
         <li class="k-radio-item">
           <label>
-            <input
+            <input type="radio" #mestre value="P" kendoRadioButton formControlName="type"
-              type="radio"
+              (change)="filterCategory('P')" />
-              #mestre
-              value="P"
-              kendoRadioButton
-              formControlName="type"
-              (change)="filterCategory('P')"
-            />
             <span> Parceiro</span>
           </label>
         </li>
 
         <li class="k-radio-item">
           <label>
-            <input
+            <input type="radio" #parceiro kendoRadioButton value="M" formControlName="type"
-              type="radio"
+              (change)="filterCategory('M')" />
-              #parceiro
-              kendoRadioButton
-              value="M"
-              formControlName="type"
-              (change)="filterCategory('M')"
-            />
             <span> Mestre</span>
           </label>
         </li>
       </ul>
-      <kendo-formerror *ngIf="formPartner.controls.type.errors?.required"
+      <kendo-formerror *ngIf="formPartner.controls.type.errors?.required">Error: O tipo do parceiro é
-        >Error: O tipo do parceiro é obrigatório</kendo-formerror
+        obrigatório</kendo-formerror>
-      >
     </kendo-formfield>
 
     <kendo-formfield *ngIf="showCommission" showHints="initial">
       <label>
         <span class="d-block">Comissão (%)</span>
-        <input
+        <input *ngIf="!inputPercentPartner()" [readOnly]="!inputPercentPartner()" disabled="!inputPercentPartner()"
-          *ngIf="!inputPercentPartner()"
+          formControlName="commission" type="number" kendoNumericTextBox />
-          [readOnly]="!inputPercentPartner()"
+        <input *ngIf="inputPercentPartner()" formControlName="commission" type="number" kendoNumericTextBox />
-          disabled="!inputPercentPartner()"
-          formControlName="commission"
-          type="number"
-          kendoNumericTextBox
-        />
-        <input
-          *ngIf="inputPercentPartner()"
-          formControlName="commission"
-          type="number"
-          kendoNumericTextBox
-        />
       </label>
     </kendo-formfield>
 
     <kendo-formfield showHints="initial">
       <label>
-        <input
+        <input kendoCheckBox id="terms" type="checkbox" formControlName="buyer" />
-          kendoCheckBox
-          id="terms"
-          type="checkbox"
-          formControlName="buyer"
-        />
         <span class="ms-2">Parceiro é comprador de cliente PJ?</span>
       </label>
     </kendo-formfield>
@@ -283,17 +176,9 @@
     <kendo-formfield>
       <label>
         <span>Cliente</span>
-        <kendo-combobox
+        <kendo-combobox textField="name" valueField="customerId" formControlName="customer" [data]="customer$ | async"
-          textField="name"
+          [loading]="loadingCustomer" [filterable]="true" (filterChange)="handleFilterCustomer($event)"
-          valueField="customerId"
+          placeholder="Selecione o cliente..." (selectionChange)="selectCustomer($event)">
-          formControlName="customer"
-          [data]="customer$ | async"
-          [loading]="loadingCustomer"
-          [filterable]="true"
-          (filterChange)="handleFilterCustomer($event)"
-          placeholder="Selecione o cliente..."
-          (selectionChange)="selectCustomer($event)"
-        >
         </kendo-combobox>
       </label>
     </kendo-formfield>
@@ -304,74 +189,46 @@
         <input formControlName="email" class="inputEmail" kendoTextBox #email />
       </label>
 
-      <kendo-formerror *ngIf="formPartner.controls.type.errors?.required"
+      <kendo-formerror *ngIf="formPartner.controls.type.errors?.required">Error: Email is required</kendo-formerror>
-        >Error: Email is required</kendo-formerror
+      <kendo-formerror *ngIf="formPartner.controls.email.errors?.email">Error: Not valid email format</kendo-formerror>
-      >
-      <kendo-formerror *ngIf="formPartner.controls.email.errors?.email"
-        >Error: Not valid email format</kendo-formerror
-      >
     </kendo-formfield>
 
     <kendo-formfield>
       <label>
         <span>RG</span>
-        <kendo-textbox
+        <kendo-textbox formControlName="rg" [clearButton]="true" #rg></kendo-textbox>
-          formControlName="rg"
-          [clearButton]="true"
-          #rg
-        ></kendo-textbox>
       </label>
 
-      <kendo-formerror *ngIf="formPartner.controls.rg.errors?.rg"
+      <kendo-formerror *ngIf="formPartner.controls.rg.errors?.rg">Error: RG é obrigaário</kendo-formerror>
-        >Error: RG é obrigaário</kendo-formerror
-      >
     </kendo-formfield>
 
     <kendo-formfield>
       <label>
         <span>Registro Profissional</span>
-        <kendo-textbox
+        <kendo-textbox formControlName="professionalNumber" [clearButton]="true" #professionalnumber></kendo-textbox>
-          formControlName="professionalNumber"
-          [clearButton]="true"
-          #professionalnumber
-        ></kendo-textbox>
       </label>
     </kendo-formfield>
 
     <kendo-formfield>
       <label>
         <span>Telefone (Whatsapp)</span>
-        <kendo-textbox
+        <kendo-textbox formControlName="phone" [clearButton]="true" #phone></kendo-textbox>
-          formControlName="phone"
-          [clearButton]="true"
-          #phone
-        ></kendo-textbox>
       </label>
     </kendo-formfield>
 
     <kendo-formfield>
       <label>
         <span>Chave PIX</span>
-        <kendo-textbox
+        <kendo-textbox formControlName="pixKey" [clearButton]="true" #pixKey></kendo-textbox>
-          formControlName="pixKey"
-          [clearButton]="true"
-          #pixKey
-        ></kendo-textbox>
       </label>
     </kendo-formfield>
 
     <kendo-formfield>
       <label>
         <span>Vendedor</span>
-        <kendo-combobox
+        <kendo-combobox textField="name" valueField="sellerId" formControlName="seller" [data]="sellers$ | async"
-          textField="name"
+          [kendoDropDownFilter]="{ operator: 'contains' }" placeholder="Selecione o vendedor que indicou o parceiro..."
-          valueField="sellerId"
+          (selectionChange)="selectSeller($event)">
-          formControlName="seller"
-          [data]="sellers$ | async"
-          [kendoDropDownFilter]="{ operator: 'contains' }"
-          placeholder="Selecione o vendedor que indicou o parceiro..."
-          (selectionChange)="selectSeller($event)"
-        >
         </kendo-combobox>
       </label>
     </kendo-formfield>
@@ -379,16 +236,9 @@
     <kendo-formfield>
       <label>
         <span>Categoria</span>
-        <kendo-combobox
+        <kendo-combobox textField="name" valueField="id" formControlName="category" [data]="filterCategoryPartners"
-          textField="name"
+          [itemDisabled]="categoryDisabled" [kendoDropDownFilter]="{ operator: 'contains' }"
-          valueField="id"
+          placeholder="Selecione a categoria do parceiro..." (selectionChange)="selectCategory($event)">
-          formControlName="category"
-          [data]="filterCategoryPartners"
-          [itemDisabled]="categoryDisabled"
-          [kendoDropDownFilter]="{ operator: 'contains' }"
-          placeholder="Selecione a categoria do parceiro..."
-          (selectionChange)="selectCategory($event)"
-        >
         </kendo-combobox>
       </label>
     </kendo-formfield>
@@ -398,12 +248,7 @@
     <kendo-formfield>
       <label>
         <span>Cep</span>
-        <kendo-textbox
+        <kendo-textbox formControlName="zipCode" [clearButton]="true" #zipCode (blur)="consultaCep()"></kendo-textbox>
-          formControlName="zipCode"
-          [clearButton]="true"
-          #zipCode
-          (blur)="consultaCep()"
-        ></kendo-textbox>
       </label>
     </kendo-formfield>
 
@@ -417,11 +262,7 @@
     <kendo-formfield>
       <label>
         <span>Número</span>
-        <kendo-textbox
+        <kendo-textbox formControlName="number" [clearButton]="true" #number></kendo-textbox>
-          formControlName="number"
-          [clearButton]="true"
-          #number
-        ></kendo-textbox>
       </label>
     </kendo-formfield>
 
@@ -456,20 +297,12 @@
     <kendo-formfield>
       <label>
         <span>Praça</span>
-        <kendo-combobox
+        <kendo-combobox [data]="places$ | async" formControlName="place"
-          [data]="places$ | async"
+          [kendoDropDownFilter]="{ operator: 'contains' }" textField="name" valueField="id"
-          formControlName="place"
+          (selectionChange)="selectPlace($event)" placeholder="Selecione a praça do parceiro...">
-          [kendoDropDownFilter]="{ operator: 'contains' }"
-          textField="name"
-          valueField="id"
-          (selectionChange)="selectPlace($event)"
-          placeholder="Selecione a praça do parceiro..."
-        >
         </kendo-combobox>
       </label>
-      <kendo-formerror
+      <kendo-formerror>Erro: É obrigatório informar a praça do cliente</kendo-formerror>
-        >Erro: É obrigatório informar a praça do cliente</kendo-formerror
-      >
     </kendo-formfield>
 
     <h4 class="my-3">DADOS BANCÁRIOS</h4>
@@ -478,12 +311,7 @@
         <kendo-formfield>
           <label>
             <span>Banco</span>
-            <kendo-textbox
+            <kendo-textbox formControlName="bank" [clearButton]="true" #bank required></kendo-textbox>
-              formControlName="bank"
-              [clearButton]="true"
-              #bank
-              required
-            ></kendo-textbox>
           </label>
         </kendo-formfield>
       </div>
@@ -491,12 +319,7 @@
         <kendo-formfield>
           <label>
             <span>Agencia</span>
-            <kendo-textbox
+            <kendo-textbox formControlName="agencia" [clearButton]="true" #agencia required></kendo-textbox>
-              formControlName="agencia"
-              [clearButton]="true"
-              #agencia
-              required
-            ></kendo-textbox>
           </label>
         </kendo-formfield>
       </div>
@@ -504,12 +327,7 @@
         <kendo-formfield>
           <label>
             <span>Conta</span>
-            <kendo-textbox
+            <kendo-textbox formControlName="conta" [clearButton]="true" #conta required></kendo-textbox>
-              formControlName="conta"
-              [clearButton]="true"
-              #conta
-              required
-            ></kendo-textbox>
           </label>
         </kendo-formfield>
       </div>
@@ -524,15 +342,10 @@
       <input formControlName="observer2" kendoTextBox #observer2 />
     </label>
     <div class="k-form-buttons">
-      <button
+      <button kendoButton themeColor="primary" (click)="submitForm()" [disabled]="!formPartner.valid">
-        kendoButton
-        themeColor="primary"
-        (click)="submitForm()"
-        [disabled]="!formPartner.valid"
-      >
         Salvar
       </button>
       <button kendoButton (click)="clearForm()">Cancelar</button>
     </div>
   </form>
-</kendo-window>
+</kendo-window>

src/app/sales/components/create-customer-modal/create-customer-modal.component.html

@@ -230,10 +230,10 @@
 
             <kendo-formfield>
               <label>
-                <span>Como conheceu a JURUNENSE?</span>
+                <span>Como conheceu a SIMPPLIFIQUE?</span>
                 <kendo-combobox [data]="listCommunicate" formControlName="communicate"
                   [kendoDropDownFilter]="{ operator: 'contains' }"
-                  placeholder="Informe como o cliente conheceu a JURUNENSE...">
+                  placeholder="Informe como o cliente conheceu a SIMPLIFIQUE...">
                 </kendo-combobox>
               </label>
             </kendo-formfield>

src/app/sales/pages/orders/orders.component.ts

@@ -239,6 +239,8 @@ export class OrdersComponent implements OnInit, OnDestroy {
   }
 
   openPrintOrder() {
+    //this.urlPrintOrder = 'http://localhost:52986/Viewer/{action}?orderId=' +
+    //'http://172.35.0.219:8068/Viewer/{action}?orderId=' +
     this.urlPrintOrder = 'http://172.35.0.219:8068/Viewer/{action}?orderId=' +
       this.orderNumber + '&model=' + this.modelPrintOrder;
     this.titleInformation = 'Gravar pedido de venda';