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

src/app/auth/login/login.component.html

@@ -29,13 +29,8 @@
                 <kendo-textbox class="k-textbox is-text" type="password" placeholder="Informe sua senha" #password
                   formControlName="password">
                   <ng-template kendoTextBoxSuffixTemplate>
-                    <button
+                    <button kendoButton look="clear" [icon]="passwordVisible ? 'eye-slash' : 'eye'"
-                      kendoButton
+                      (click)="toggleVisibility()" type="button"></button>
-                      look="clear"
-                      [icon]="passwordVisible ? 'eye-slash' : 'eye'"
-                      (click)="toggleVisibility()"
-                      type="button"
-                    ></button>
                   </ng-template>
                 </kendo-textbox>
               </label>

src/app/auth/login/login.component.ts

@@ -75,7 +75,7 @@ export class LoginComponent implements OnInit, AfterViewInit {
             this.authService.setDataInLocalStorage('user', JSON.stringify(res.data));
             this.authService.setDataInLocalStorage('token', res.data.token);
             localStorage.removeItem('cart');
-            this.router.navigate(['/menu']);
+            this.router.navigate(['/sales/menu']);
           } else {
             this.loadingIcon = '';
             this.showErrorMessage(res.message);

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

@@ -1,11 +1,5 @@
-<kendo-dialog
+<kendo-dialog *ngIf="openedDialog" [(width)]="windowWidth" [(height)]="windowHeight" (close)="closeDialog()"
-  *ngIf="openedDialog"
+  title="Novo endereço" autoFocusedElement="#zipCode">
-  [(width)]="windowWidth"
-  [(height)]="windowHeight"
-  (close)="closeDialog()"
-  title="Novo endereço"
-  autoFocusedElement="#zipCode"
->
   <!--kendo-window-titlebar
     style="background-color: rgb(34, 34, 61); color: white"
   >
@@ -25,28 +19,17 @@
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Cep</span>
-                <input
+                <input kendoTextBox id="zipCode" formControlName="zipCode" showSuccessIcon="initial"
-                  kendoTextBox
+                  showErrorIcon="initial" (blur)="consultaCep()">
-                  id="zipCode"
-                  formControlName="zipCode"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="consultaCep()"
-                >
               </label>
             </kendo-formfield>
 
             <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"
+                  placeholder="Selecione a praça do cliente...">
-                [kendoDropDownFilter]="{ operator: 'contains' }"
-                textField="name"
-                valueField="id"
-                placeholder="Selecione a praça do cliente..."
-              >
                 </kendo-combobox>
               </label>
 
@@ -55,80 +38,49 @@
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Endereço</span>
-                <kendo-textbox
+                <kendo-textbox #address [maxlength]="40" formControlName="address" showSuccessIcon="initial"
-                  #address
+                  showErrorIcon="initial" (blur)="removeCharacters('address')"></kendo-textbox>
-                  [maxlength]="40"
-                  formControlName="address"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="removeCharacters('address')"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Número</span>
-                <kendo-textbox
+                <kendo-textbox #addressNumber formControlName="addressNumber" showSuccessIcon="initial"
-                  #addressNumber
-                  formControlName="addressNumber"
-                  showSuccessIcon="initial"
                   showErrorIcon="initial"
-                  onkeypress="return event.charCode >= 48 && event.charCode <= 57"
+                  onkeypress="return event.charCode >= 48 && event.charCode <= 57"></kendo-textbox>
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Complemento</span>
-                <kendo-textbox
+                <kendo-textbox #complement [maxlength]="40" formControlName="complement" showSuccessIcon="initial"
-                  #complement
+                  showErrorIcon="initial" (blur)="removeCharacters('complement')"></kendo-textbox>
-                  [maxlength]="40"
-                  formControlName="complement"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="removeCharacters('complement')"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Bairro</span>
-                <kendo-textbox
+                <kendo-textbox #neighbourhood formControlName="neighborhood" showSuccessIcon="initial"
-                  #neighbourhood
+                  showErrorIcon="initial" (blur)="removeCharacters('neighborhood')"></kendo-textbox>
-                  formControlName="neighborhood"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="removeCharacters('neighborhood')"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Cidade</span>
-                <kendo-textbox
+                <kendo-textbox #city [maxlength]="15" formControlName="city" showSuccessIcon="initial"
-                  #city
+                  showErrorIcon="initial" (blur)="removeCharacters('city')"></kendo-textbox>
-                  [maxlength]="15"
-                  formControlName="city"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="removeCharacters('city')"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Estado</span>
-                <kendo-textbox
+                <kendo-textbox #state formControlName="state" showSuccessIcon="initial"
-                  #state
+                  showErrorIcon="initial"></kendo-textbox>
-                  formControlName="state"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
@@ -138,37 +90,21 @@
                 <ul class="k-radio-list k-list-horizontal">
                   <li class="k-radio-item">
                     <label>
-                      <input
+                      <input type="radio" #addressTypeNormal value="N" kendoRadioButton formControlName="addressType" />
-                        type="radio"
-                        #addressTypeNormal
-                        value="N"
-                        kendoRadioButton
-                        formControlName="addressType"
-                      />
                       <span class="ms-2">Normal</span>
                     </label>
                   </li>
                   <li class="k-radio-item">
                     <label>
-                      <input
+                      <input type="radio" #addressTypeShopping value="S" kendoRadioButton
-                        type="radio"
+                        formControlName="addressType" />
-                        #addressTypePorto
+                      <span class="ms-2">Shopping</span>
-                        value="P"
-                        kendoRadioButton
-                        formControlName="addressType"
-                      />
-                      <span class="ms-2">Porto</span>
                     </label>
                   </li>
                   <li class="k-radio-item">
                     <label>
-                      <input
+                      <input type="radio" #addressTypeCondominio value="C" kendoRadioButton
-                        type="radio"
+                        formControlName="addressType" />
-                        #addressTypeCondominio
-                        value="C"
-                        kendoRadioButton
-                        formControlName="addressType"
-                      />
                       <span class="ms-2">Condominio</span>
                     </label>
                   </li>
@@ -180,26 +116,16 @@
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Ponto de referencia</span>
-                <kendo-textbox
+                <kendo-textbox #state formControlName="referencePoint" showSuccessIcon="initial" showErrorIcon="initial"
-                  #state
+                  (blur)="removeCharacters('referencePoint')"></kendo-textbox>
-                  formControlName="referencePoint"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="removeCharacters('referencePoint')"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Observações</span>
-                <kendo-textbox
+                <kendo-textbox #state formControlName="note" showSuccessIcon="initial" showErrorIcon="initial"
-                  #state
+                  (blur)="removeCharacters('note')"></kendo-textbox>
-                  formControlName="note"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="removeCharacters('note')"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
           </fieldset>
@@ -210,11 +136,7 @@
         <div class="k-loading-panel">
           <div class="k-loading-panel-mask"></div>
           <div class="k-loading-panel-wrapper">
-            <kendo-loader
+            <kendo-loader [type]="'infinite-spinner'" [themeColor]="'primary'" [size]="'large'">
-              [type]="'infinite-spinner'"
-              [themeColor]="'primary'"
-              [size]="'large'"
-            >
             </kendo-loader>
             <div class="k-loading-panel-text">Aguarde...</div>
           </div>
@@ -225,53 +147,27 @@
   </div>
 
   <kendo-dialog-actions>
-    <button
+    <button (click)="showConfirmation()" class="btn-fill-blue text-btn-white" kendoButton [primary]="true"
-      (click)="showConfirmation()"
+      [disabled]="!form.valid">
-      class="btn-fill-blue text-btn-white"
-      kendoButton
-      [primary]="true"
-      [disabled]="!form.valid"
-    >
       Gravar
     </button>
-    <button
+    <button class="btn-flat text-btn-flat" kendoButton look="flat" (click)="closeDialog()">
-      class="btn-flat text-btn-flat"
-      kendoButton
-      look="flat"
-      (click)="closeDialog()"
-    >
       Cancelar
     </button>
 
-    <button
+    <button class="btn-flat text-btn-flat" kendoButton look="flat" (click)="googleGeocode()">
-    class="btn-flat text-btn-flat"
-    kendoButton
-    look="flat"
-    (click)="googleGeocode()"
-  >
       Mapa do Endereço
     </button>
   </kendo-dialog-actions>
 
-  <app-confirmation
+  <app-confirmation *ngIf="isShowConfirmation" opened="isShowConfirmation" title="{{ titleMessage }}"
-    *ngIf="isShowConfirmation"
+    message="{{ messageConfirmation }}" textButtonConfirmation="{{ textButtonConfirmation }}"
-    opened="isShowConfirmation"
+    textButtonCancel="{{ textButtonCancel }}" (resultEvent)="returnConfirmationSalve($event)"></app-confirmation>
-    title="{{ titleMessage }}"
-    message="{{ messageConfirmation }}"
-    textButtonConfirmation="{{ textButtonConfirmation }}"
-    textButtonCancel="{{ textButtonCancel }}"
-    (resultEvent)="returnConfirmationSalve($event)"
-  ></app-confirmation>
 </kendo-dialog>
 
 
-<kendo-dialog
+<kendo-dialog *ngIf="showMap" [height]="600" [width]="800" title="Confirme a localização do endereço"
-  *ngIf="showMap"
+  (close)="MapCep(false)">
-  [height]="600"
-  [width]="800"
-  title="Confirme a localização do endereço"
-  (close)="MapCep(false)"
->
   <agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="zoom">
     <agm-marker [latitude]="latitude" [longitude]="longitude"></agm-marker>
   </agm-map>

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

@@ -1,11 +1,5 @@
-<kendo-dialog
+<kendo-dialog *ngIf="openedDialog" [(width)]="windowWidth" [(height)]="windowHeight" (close)="closeDialog()"
-  *ngIf="openedDialog"
+  autoFocusedElement="#person" title="Novo cliente">
-  [(width)]="windowWidth"
-  [(height)]="windowHeight"
-  (close)="closeDialog()"
-  autoFocusedElement="#person"
-  title="Novo cliente"
->
   <!--kendo-window-titlebar
     style="background-color: rgb(34, 34, 61); color: white"
   >
@@ -27,23 +21,11 @@
                 <div class="col-12 col-sm-8">
                   <div class="row">
                     <div class="col-1">
-                      <input
+                      <input type="radio" value="true" #company formControlName="company" kendoRadioButton />
-                        type="radio"
-                        value="true"
-                        #company
-                        formControlName="company"
-                        kendoRadioButton
-                      />
                     </div>
                     <div class="col-5 text-start p-0">Jurídica</div>
                     <div class="col-1">
-                      <input
+                      <input type="radio" value="false" id="person" formControlName="company" kendoRadioButton />
-                        type="radio"
-                        value="false"
-                        id="person"
-                        formControlName="company"
-                        kendoRadioButton
-                      />
                     </div>
                     <div class="col-5 text-start p-0">Física</div>
                   </div>
@@ -51,19 +33,11 @@
               </div>
             </div>
 
-            <kendo-formfield
+            <kendo-formfield showErrors="initial" *ngIf="form.value['company'] == 'false'">
-              showErrors="initial"
-              *ngIf="form.value['company'] == 'false'"
-            >
               <label>
                 <span>Cpf</span>
-                <kendo-maskedtextbox
+                <kendo-maskedtextbox formControlName="cpfCnpj" [mask]="cpfMask" id="inputCpf"
-                  formControlName="cpfCnpj"
+                  (blur)="searchCustomerByDocument()" required>
-                  [mask]="cpfMask"
-                  id="inputCpf"
-                  (blur)="searchCustomerByDocument()"
-                  required
-                >
                 </kendo-maskedtextbox>
               </label>
 
@@ -76,37 +50,22 @@
             <kendo-formfield *ngIf="form.value['company'] == 'true'">
               <label>
                 <span>Cnpj</span>
-                <kendo-maskedtextbox
+                <kendo-maskedtextbox #cnpj formControlName="cpfCnpj" [mask]="cnpjMask" #inputCnpj
-                  #cnpj
+                  (blur)="searchCustomerByDocument()" required>
-                  formControlName="cpfCnpj"
-                  [mask]="cnpjMask"
-                  #inputCnpj
-                  (blur)="searchCustomerByDocument()"
-                  required
-                >
                   <kendo-loader *ngIf="loaderVisible" size="small">
                   </kendo-loader>
                 </kendo-maskedtextbox>
               </label>
-              <kendo-formerror
+              <kendo-formerror>Erro: CNPJ deve ser informado para cliente pessoa
-                >Erro: CNPJ deve ser informado para cliente pessoa
+                jurídica</kendo-formerror>
-                jurídica</kendo-formerror
-              >
             </kendo-formfield>
 
             <kendo-formfield showErrors="initial">
               <label>
                 <span>Nome</span>
-                <kendo-textbox
+                <kendo-textbox [maxlength]="40" formControlName="name" #firstName required showSuccessIcon="initial"
-                  [maxlength]="40"
+                  showErrorIcon="initial" partner="^[a-zA-Z0-9._\b]+$"
-                  formControlName="name"
+                  (blur)="removeCharacters('name')"></kendo-textbox>
-                  #firstName
-                  required
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  partner="^[a-zA-Z0-9._\b]+$"
-                  (blur)="removeCharacters('name')"
-                ></kendo-textbox>
               </label>
               <kendo-formerror>Erro: Nome é obrigatório</kendo-formerror>
             </kendo-formfield>
@@ -116,33 +75,15 @@
               <!-- <div class="row d-flex flex-row"> -->
               <div class="row w-100">
                 <div class="col-1">
-                  <input
+                  <input type="radio" value="F" #company formControlName="gender" kendoRadioButton />
-                    type="radio"
-                    value="F"
-                    #company
-                    formControlName="gender"
-                    kendoRadioButton
-                  />
                 </div>
                 <div class="col-3 text-start p-0">Feminino</div>
                 <div class="col-1">
-                  <input
+                  <input type="radio" value="M" id="gender" formControlName="gender" kendoRadioButton />
-                    type="radio"
-                    value="M"
-                    id="gender"
-                    formControlName="gender"
-                    kendoRadioButton
-                  />
                 </div>
                 <div class="col-3 text-start p-0">Masculino</div>
                 <div class="col-1">
-                  <input
+                  <input type="radio" value="N" id="gender" formControlName="gender" kendoRadioButton />
-                    type="radio"
-                    value="N"
-                    id="gender"
-                    formControlName="gender"
-                    kendoRadioButton
-                  />
                 </div>
                 <div class="col-3 text-start p-0">Não declarado</div>
               </div>
@@ -151,139 +92,80 @@
             <kendo-formfield showHints="initial" showErrors="initial">
               <label>
                 <span>Celular</span>
-                <kendo-maskedtextbox
+                <kendo-maskedtextbox #phoneNumber formControlName="cellPhone" [mask]="phoneNumberMask"
-                  #phoneNumber
+                  [value]="phoneNumberValue" showSuccessIcon="initial" showErrorIcon="initial"></kendo-maskedtextbox>
-                  formControlName="cellPhone"
-                  [mask]="phoneNumberMask"
-                  [value]="phoneNumberValue"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                ></kendo-maskedtextbox>
               </label>
             </kendo-formfield>
 
-            <kendo-formfield
+            <kendo-formfield *ngIf="form.value['company'] == 'true'" showHints="initial" showErrors="always">
-              *ngIf="form.value['company'] == 'true'"
-              showHints="initial"
-              showErrors="always"
-            >
               <label>
                 <span>Inscrição Estadual</span>
-                <kendo-textbox
+                <kendo-textbox #numberState formControlName="numberState" showSuccessIcon="initial"
-                  #numberState
+                  showErrorIcon="initial"></kendo-textbox>
-                  formControlName="numberState"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>EMail</span>
-                <kendo-textbox
+                <kendo-textbox #email formControlName="email" showSuccessIcon="initial"
-                  #email
+                  showErrorIcon="initial"></kendo-textbox>
-                  formControlName="email"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Cep</span>
-                <kendo-textbox
+                <kendo-textbox #zipCode maxlength="8" formControlName="zipCode" showSuccessIcon="initial"
-                  #zipCode
+                  showErrorIcon="initial" (blur)="consultaCep()"></kendo-textbox>
-                  maxlength="8"
-                  formControlName="zipCode"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="consultaCep()"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Endereço</span>
-                <kendo-textbox
+                <kendo-textbox #address [maxlength]="40" formControlName="address" showSuccessIcon="initial"
-                  #address
+                  showErrorIcon="initial" (blur)="removeCharacters('address')"></kendo-textbox>
-                  [maxlength]="40"
-                  formControlName="address"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="removeCharacters('address')"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Número</span>
-                <kendo-textbox
+                <kendo-textbox onkeypress="return event.charCode >= 48 && event.charCode <= 57" #addressNumber
-                  onkeypress="return event.charCode >= 48 && event.charCode <= 57"
+                  formControlName="addressNumber" showSuccessIcon="initial" showErrorIcon="initial"></kendo-textbox>
-                  #addressNumber
-                  formControlName="addressNumber"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Complemento</span>
-                <kendo-textbox
+                <kendo-textbox #complement [maxlength]="40" formControlName="complement" showSuccessIcon="initial"
-                  #complement
+                  showErrorIcon="initial" (blur)="removeCharacters('complement')"></kendo-textbox>
-                  [maxlength]="40"
-                  formControlName="complement"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="removeCharacters('complement')"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Bairro</span>
-                <kendo-textbox
+                <kendo-textbox #neighbourhood [maxlength]="40" formControlName="neighborhood" showSuccessIcon="initial"
-                  #neighbourhood
+                  showErrorIcon="initial" (blur)="removeCharacters('neighborhood')"></kendo-textbox>
-                  [maxlength]="40"
-                  formControlName="neighborhood"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="removeCharacters('neighborhood')"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Cidade</span>
-                <kendo-textbox
+                <kendo-textbox #city [maxlength]="15" formControlName="city" showSuccessIcon="initial"
-                  #city
+                  showErrorIcon="initial" (blur)="removeCharacters('city')"></kendo-textbox>
-                  [maxlength]="15"
-                  formControlName="city"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="removeCharacters('city')"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Estado</span>
-                <kendo-textbox
+                <kendo-textbox #state [maxlength]="2" formControlName="state" showSuccessIcon="initial"
-                  #state
+                  showErrorIcon="initial" (blur)="removeCharacters('state')"></kendo-textbox>
-                  [maxlength]="2"
-                  formControlName="state"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                  (blur)="removeCharacters('state')"
-                ></kendo-textbox>
               </label>
             </kendo-formfield>
 
@@ -293,37 +175,21 @@
                 <ul class="k-radio-list k-list-horizontal">
                   <li class="k-radio-item">
                     <label>
-                      <input
+                      <input type="radio" #addressTypeNormal value="N" kendoRadioButton formControlName="addressType" />
-                        type="radio"
-                        #addressTypeNormal
-                        value="N"
-                        kendoRadioButton
-                        formControlName="addressType"
-                      />
                       <span class="ms-2">Normal</span>
                     </label>
                   </li>
                   <li class="k-radio-item">
                     <label>
-                      <input
+                      <input type="radio" #addressTypeShopping value="S" kendoRadioButton
-                        type="radio"
+                        formControlName="addressType" />
-                        #addressTypePorto
+                      <span class="ms-2">Shopping</span>
-                        value="P"
-                        kendoRadioButton
-                        formControlName="addressType"
-                      />
-                      <span class="ms-2">Porto</span>
                     </label>
                   </li>
                   <li class="k-radio-item">
                     <label>
-                      <input
+                      <input type="radio" #addressTypeCondominio value="C" kendoRadioButton
-                        type="radio"
+                        formControlName="addressType" />
-                        #addressTypeCondominio
-                        value="C"
-                        kendoRadioButton
-                        formControlName="addressType"
-                      />
                       <span class="ms-2">Condominio</span>
                     </label>
                   </li>
@@ -335,14 +201,9 @@
             <kendo-formfield>
               <label>
                 <span>Ramo de atividade</span>
-                <kendo-combobox
+                <kendo-combobox [data]="ramos$ | async" formControlName="ramo"
-                  [data]="ramos$ | async"
+                  [kendoDropDownFilter]="{ operator: 'contains' }" textField="name" valueField="id"
-                  formControlName="ramo"
+                  placeholder="Selecione a ramo de atividade do cliente...">
-                  [kendoDropDownFilter]="{ operator: 'contains' }"
-                  textField="name"
-                  valueField="id"
-                  placeholder="Selecione a ramo de atividade do cliente..."
-                >
                 </kendo-combobox>
               </label>
             </kendo-formfield>
@@ -350,44 +211,29 @@
             <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"
+                  placeholder="Selecione a praça do cliente...">
-                  [kendoDropDownFilter]="{ operator: 'contains' }"
-                  textField="name"
-                  valueField="id"
-                  placeholder="Selecione a praça do cliente..."
-                >
                 </kendo-combobox>
               </label>
-              <kendo-formerror
+              <kendo-formerror>Erro: É obrigatório informar a praça do
-                >Erro: É obrigatório informar a praça do
+                cliente</kendo-formerror>
-                cliente</kendo-formerror
-              >
             </kendo-formfield>
 
             <kendo-formfield showHints="initial" showErrors="always">
               <label>
                 <span>Data de nascimento</span>
-                <kendo-dateinput
+                <kendo-dateinput #birthdate [format]="format" formControlName="birthdate" showSuccessIcon="initial"
-                  #birthdate
+                  showErrorIcon="initial"></kendo-dateinput>
-                  [format]="format"
-                  formControlName="birthdate"
-                  showSuccessIcon="initial"
-                  showErrorIcon="initial"
-                ></kendo-dateinput>
               </label>
             </kendo-formfield>
 
             <kendo-formfield>
               <label>
                 <span>Como conheceu a JURUNENSE?</span>
-                <kendo-combobox
+                <kendo-combobox [data]="listCommunicate" formControlName="communicate"
-                  [data]="listCommunicate"
-                  formControlName="communicate"
                   [kendoDropDownFilter]="{ operator: 'contains' }"
-                  placeholder="Informe como o cliente conheceu a JURUNENSE..."
+                  placeholder="Informe como o cliente conheceu a JURUNENSE...">
-                >
                 </kendo-combobox>
               </label>
             </kendo-formfield>
@@ -395,15 +241,9 @@
             <kendo-formfield>
               <label>
                 <span>Categoria</span>
-                <kendo-combobox
+                <kendo-combobox [data]="category$ | async" formControlName="category"
-                  [data]="category$ | async"
+                  (valueChange)="filterSubCategoria($event)" [kendoDropDownFilter]="{ operator: 'contains' }"
-                  formControlName="category"
+                  textField="name" valueField="id" placeholder="Selecione a categoria do cliente...">
-                  (valueChange)="filterSubCategoria($event)"
-                  [kendoDropDownFilter]="{ operator: 'contains' }"
-                  textField="name"
-                  valueField="id"
-                  placeholder="Selecione a categoria do cliente..."
-                >
                 </kendo-combobox>
               </label>
             </kendo-formfield>
@@ -411,27 +251,16 @@
             <kendo-formfield>
               <label>
                 <span>Sub-Categoria</span>
-                <kendo-combobox
+                <kendo-combobox [data]="subCategories" formControlName="subCategory"
-                  [data]="subCategories"
+                  [kendoDropDownFilter]="{ operator: 'contains' }" textField="name" valueField="id"
-                  formControlName="subCategory"
+                  placeholder="Selecione a sub-categoria do cliente...">
-                  [kendoDropDownFilter]="{ operator: 'contains' }"
-                  textField="name"
-                  valueField="id"
-                  placeholder="Selecione a sub-categoria do cliente..."
-                >
                 </kendo-combobox>
               </label>
             </kendo-formfield>
 
             <kendo-formfield>
-              <kendo-label
+              <kendo-label [for]="allow" text="Permite envio de mensagens"></kendo-label>
-                [for]="allow"
+              <kendo-switch #allow formControlName="notifications"></kendo-switch>
-                text="Permite envio de mensagens"
-              ></kendo-label>
-              <kendo-switch
-                #allow
-                formControlName="notifications"
-              ></kendo-switch>
             </kendo-formfield>
           </fieldset>
         </form>
@@ -441,11 +270,7 @@
         <div class="k-loading-panel">
           <div class="k-loading-panel-mask"></div>
           <div class="k-loading-panel-wrapper">
-            <kendo-loader
+            <kendo-loader [type]="'infinite-spinner'" [themeColor]="'primary'" [size]="'large'">
-              [type]="'infinite-spinner'"
-              [themeColor]="'primary'"
-              [size]="'large'"
-            >
             </kendo-loader>
             <div class="k-loading-panel-text">Aguarde...</div>
           </div>
@@ -462,42 +287,21 @@
   </div> -->
 
   <kendo-dialog-actions>
-    <button
+    <button (click)="showConfirmation()" class="btn-fill-blue text-btn-white" kendoButton [primary]="true"
-      (click)="showConfirmation()"
+      [disabled]="!form.valid || inProcess">
-      class="btn-fill-blue text-btn-white"
-      kendoButton
-      [primary]="true"
-      [disabled]="!form.valid || inProcess"
-    >
       Gravar
     </button>
-    <button
+    <button class="btn-flat text-btn-flat" kendoButton look="flat" (click)="closeDialog()">
-      class="btn-flat text-btn-flat"
-      kendoButton
-      look="flat"
-      (click)="closeDialog()"
-    >
       Cancelar
     </button>
-    <button
+    <button class="btn-flat text-btn-flat" kendoButton look="flat" (click)="googleGeocode()">
-      class="btn-flat text-btn-flat"
-      kendoButton
-      look="flat"
-      (click)="googleGeocode()"
-    >
       Mapa do endereço
     </button>
   </kendo-dialog-actions>
 
-  <app-confirmation
+  <app-confirmation *ngIf="isShowConfirmation" opened="isShowConfirmation" title="{{ titleMessage }}"
-    *ngIf="isShowConfirmation"
+    message="{{ messageConfirmation }}" textButtonConfirmation="{{ textButtonConfirmation }}"
-    opened="isShowConfirmation"
+    textButtonCancel="{{ textButtonCancel }}" (resultEvent)="returnConfirmationSalve($event)"></app-confirmation>
-    title="{{ titleMessage }}"
-    message="{{ messageConfirmation }}"
-    textButtonConfirmation="{{ textButtonConfirmation }}"
-    textButtonCancel="{{ textButtonCancel }}"
-    (resultEvent)="returnConfirmationSalve($event)"
-  ></app-confirmation>
 </kendo-dialog>
 
 <!-- <kendo-dialog

src/app/sales/pages/dash-sales/dash-sales.component.html

@@ -10,18 +10,18 @@
             <button kendoButton class="new-order text-button" (click)="openNewOrder()">
               Novo pedido
             </button>
-            <button kendoButton class="button-flat text-button-flat mt-2" (click)="openDashTodaysale()">
+            <!-- <button kendoButton class="button-flat text-button-flat mt-2" (click)="openDashTodaysale()">
               Dashboard Venda dia
             </button>
             <button kendoButton class="button-flat text-button-flat mt-2" (click)="openDashSeller()">
               Dashboard Vendedor
-            </button>
+            </button> -->
             <button kendoButton class="button-flat text-button-flat mt-2" (click)="openOrders()">
               Pedidos de venda
             </button>
-            <button kendoButton class="button-flat text-button-flat mt-2" (click)="openProductOrder()">
+            <!--button kendoButton class="button-flat text-button-flat mt-2" (click)="openProductOrder()">
               Produtos Vendidos
-            </button>
+            </button> -->
             <button kendoButton class="button-flat-blue text-button-flat-blue mt-2" (click)="openClose(true)">
               Orçamentos pendentes
             </button>

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

@@ -9,13 +9,8 @@
           <div class="col-md-6 col-sm-12">
             <label>
               <span>Filial de venda</span>
-              <kendo-combobox
+              <kendo-combobox [data]="store$ | async" textField="shortName" valueField="id"
-                [data]="store$ | async"
+                placeholder="Selecione a filial de venda..." (selectionChange)="selectedStore($event)"></kendo-combobox>
-                textField="shortName"
-                valueField="id"
-                placeholder="Selecione a filial de venda..."
-                (selectionChange)="selectedStore($event)"
-              ></kendo-combobox>
             </label>
           </div>
           <div class="col-md-6 col-sm-12 mt-3 mt-md-0">
@@ -33,16 +28,10 @@
               <span class="d-block">Data do pedido</span>
               <kendo-daterange class="d-flex gap-3 align-items-center">
                 <kendo-floatinglabel text="Início" id="dtinicio">
-                  <kendo-dateinput
+                  <kendo-dateinput kendoDateRangeStartInput [(value)]="filterPreOrder.start"></kendo-dateinput>
-                    kendoDateRangeStartInput
-                    [(value)]="filterPreOrder.start"
-                  ></kendo-dateinput>
                 </kendo-floatinglabel>
                 <kendo-floatinglabel text="Término" id="dtfim">
-                  <kendo-dateinput
+                  <kendo-dateinput kendoDateRangeEndInput [(value)]="filterPreOrder.end"></kendo-dateinput>
-                    kendoDateRangeEndInput
-                    [(value)]="filterPreOrder.end"
-                  ></kendo-dateinput>
                 </kendo-floatinglabel>
               </kendo-daterange>
             </label>
@@ -50,10 +39,7 @@
           <div class="col-md-6 col-sm-12 mt-3 mt-md-0">
             <label>
               <span class="d-block">CPF / CNPJ</span>
-              <kendo-textbox
+              <kendo-textbox formControlName="document" placeholder="Informe o CPF ou CNPJ do cliente"></kendo-textbox>
-                formControlName="document"
-                placeholder="Informe o CPF ou CNPJ do cliente"
-              ></kendo-textbox>
             </label>
           </div>
         </div>
@@ -63,10 +49,8 @@
           <div class="col-12">
             <label class="w-100">
               <span class="d-block">Nome do cliente</span>
-              <kendo-textbox
+              <kendo-textbox formControlName="nameCustomer"
-                formControlName="nameCustomer"
+                placeholder="Informe o nome ou razão social do cliente"></kendo-textbox>
-                placeholder="Informe o nome ou razão social do cliente"
-              ></kendo-textbox>
             </label>
           </div>
         </div>
@@ -80,47 +64,28 @@
 
     <!-- Grid -->
     <div class="col-12 mt-4 flex-fill">
-      <kendo-grid
+      <kendo-grid [kendoGridBinding]="orders" [sortable]="true" [loading]="isLoading" [height]="280"
-        [kendoGridBinding]="orders"
+        (edit)="selectedOrder($event)" (remove)="showItensOrder($event)">
-        [sortable]="true"
-        [loading]="isLoading"
-        [height]="280"
-        (edit)="selectedOrder($event)"
-        (remove)="showItensOrder($event)"
-      >
         <kendo-grid-command-column title="Ações" width="190">
           <ng-template kendoGridCellTemplate let-dataItem>
             <div style="display: flex; align-items: center; gap: 10px;">
               <button kendoGridEditCommand icon="edit"></button>
               <button kendoGridRemoveCommand icon="binoculars"></button>
-              <button
+              <button kendoButton icon="printer" (click)="showItensOrder2(dataItem)"></button>
-                kendoButton
+              <!-- <button
-                icon="printer"
-                (click)="showItensOrder2(dataItem)"
-              ></button>
-              <button
                 kendoButton
                 class="p-1"
                 (click)="openReceivePix(true, dataItem)"
               >
                 <div class="logo-pix"></div>
-              </button>
+              </button> -->
             </div>
           </ng-template>
 
         </kendo-grid-command-column>
-        <kendo-grid-column
+        <kendo-grid-column *ngFor="let col of columns" [field]="col.field" [title]="col.title" [width]="col.width"
-          *ngFor="let col of columns"
+          [class]="{ 'text-end': col.textEnd }">
-          [field]="col.field"
+          <ng-template *ngIf="col.field == 'orderValue'" kendoGridCellTemplate let-dataItem>
-          [title]="col.title"
-          [width]="col.width"
-          [class]="{ 'text-end': col.textEnd }"
-        >
-          <ng-template
-            *ngIf="col.field == 'orderValue'"
-            kendoGridCellTemplate
-            let-dataItem
-          >
             <span>{{ dataItem.orderValue | currency }}</span>
           </ng-template>
         </kendo-grid-column>
@@ -129,57 +94,29 @@
   </div>
 
   <div *ngIf="showInformation">
-    <app-message-information
+    <app-message-information opened="true" title="Pedido de venda" [message]="messageInformation"
-      opened="true"
+      [information]="informationDescription" (resultEvent)="closeInformation($event)"></app-message-information>
-      title="Pedido de venda"
-      [message]="messageInformation"
-      [information]="informationDescription"
-      (resultEvent)="closeInformation($event)"
-    ></app-message-information>
   </div>
 
   <div *ngIf="showInformationSeller">
-    <app-message-information
+    <app-message-information opened="true" title="Pedido de venda" message="Pedido não pode ser alterado!"
-      opened="true"
-      title="Pedido de venda"
-      message="Pedido não pode ser alterado!"
       information="Pedido de outro vendedor, somente o vendedor responsável da venda poderá alterar o pedido."
-      (resultEvent)="closeInformationSeller($event)"
+      (resultEvent)="closeInformationSeller($event)"></app-message-information>
-    ></app-message-information>
   </div>
 
   <div class="k-loading-panel" *ngIf="loadingPanelVisible">
     <div class="k-loading-panel-mask"></div>
     <div class="k-loading-panel-wrapper">
-      <kendo-loader
+      <kendo-loader type="infinite-spinner" themeColor="primary" size="large"></kendo-loader>
-        type="infinite-spinner"
-        themeColor="primary"
-        size="large"
-      ></kendo-loader>
       <div class="k-loading-panel-text">Loading...</div>
     </div>
   </div>
 </div>
 
-<kendo-dialog
+<kendo-dialog title="Itens do pedido" animation="zoom" *ngIf="openedItensOrder"
-  title="Itens do pedido"
+  (close)="closeModelItensOrder('Cancelar')" [minWidth]="250" [width]="1200" [height]="450">
-  animation="zoom"
+  <kendo-grid [kendoGridBinding]="orderItens" style="width: 1150px" [scrollable]="true">
-  *ngIf="openedItensOrder"
+    <kendo-grid-column field="productId" title="Código" [width]="70"></kendo-grid-column>
-  (close)="closeModelItensOrder('Cancelar')"
-  [minWidth]="250"
-  [width]="1200"
-  [height]="450"
->
-  <kendo-grid
-    [kendoGridBinding]="orderItens"
-    style="width: 1150px"
-    [scrollable]="true"
-  >
-    <kendo-grid-column
-      field="productId"
-      title="Código"
-      [width]="70"
-    ></kendo-grid-column>
     <kendo-grid-column field="description" title="Descrição" [width]="250">
     </kendo-grid-column>
     <kendo-grid-column field="package" title="Embalagem" [width]="80">
@@ -188,32 +125,17 @@
     </kendo-grid-column>
     <kendo-grid-column field="local" title="Ambiente" [width]="100">
     </kendo-grid-column>
-    <kendo-grid-column
+    <kendo-grid-column [class]="{ 'text-end': true }" field="price" title="P.Venda" [width]="80">
-      [class]="{ 'text-end': true }"
-      field="price"
-      title="P.Venda"
-      [width]="80"
-    >
       <ng-template kendoGridCellTemplate let-dataItem>
         <span>{{ dataItem.price | currency }}</span>
       </ng-template>
     </kendo-grid-column>
-    <kendo-grid-column
+    <kendo-grid-column [class]="{ 'text-end': true }" field="quantity" title="Qtde" [width]="60">
-      [class]="{ 'text-end': true }"
-      field="quantity"
-      title="Qtde"
-      [width]="60"
-    >
       <ng-template kendoGridCellTemplate let-dataItem>
         <span>{{ dataItem.quantity | number : "1.0-3" }}</span>
       </ng-template>
     </kendo-grid-column>
-    <kendo-grid-column
+    <kendo-grid-column [class]="{ 'text-end': true }" field="subTotal" title="Valor Total" [width]="80">
-      [class]="{ 'text-end': true }"
-      field="subTotal"
-      title="Valor Total"
-      [width]="80"
-    >
       <ng-template kendoGridCellTemplate let-dataItem>
         <span>{{ dataItem.subTotal | currency }}</span>
       </ng-template>
@@ -221,39 +143,21 @@
   </kendo-grid>
 </kendo-dialog>
 
-<kendo-dialog
+<kendo-dialog title="Selecione o modelo do pedido" animation="zoom" *ngIf="openedModelPrintOrder"
-  title="Selecione o modelo do pedido"
+  (close)="closeModelPrintOrder('Cancelar')" [minWidth]="250" [width]="450">
-  animation="zoom"
-  *ngIf="openedModelPrintOrder"
-  (close)="closeModelPrintOrder('Cancelar')"
-  [minWidth]="250"
-  [width]="450"
->
   <form class="k-form" [formGroup]="formModelOrder">
     <kendo-formfield showHints="initial">
       <label class="k-label">Selecione o modelo de pedido</label>
       <ul class="k-radio-list">
         <li class="k-radio-item">
           <label>
-            <input
+            <input type="radio" #bobina value="B" kendoRadioButton formControlName="model" />
-              type="radio"
-              #bobina
-              value="B"
-              kendoRadioButton
-              formControlName="model"
-            />
             <span class="ms-2">Bobina</span>
           </label>
         </li>
         <li class="k-radio-item">
           <label>
-            <input
+            <input type="radio" #bobina value="A" kendoRadioButton formControlName="model" />
-              type="radio"
-              #bobina
-              value="A"
-              kendoRadioButton
-              formControlName="model"
-            />
             <span class="ms-2">Formulário A4</span>
           </label>
         </li>
@@ -262,56 +166,26 @@
   </form>
   <kendo-dialog-actions>
     <button kendoButton (click)="closeModelPrintOrder('Não')">Cancelar</button>
-    <button
+    <button kendoButton (click)="closeModelPrintOrder('Sim')" themeColor="primary">
-      kendoButton
-      (click)="closeModelPrintOrder('Sim')"
-      themeColor="primary"
-    >
       Imprimir
     </button>
   </kendo-dialog-actions>
 </kendo-dialog>
 
-<kendo-window
+<kendo-window [top]="100" [left]="50" title="Pedido de venda" [(state)]="windowState" *ngIf="openedPrintOrder"
-  [top]="100"
+  (close)="openClosePrintOrder(false)">
-  [left]="50"
+  <stimulsoft-viewer-angular [requestUrl]="urlPrintOrder" [action]="'InitViewerOrder'" [width]="'95%'"
-  title="Pedido de venda"
+    [height]="'800px'"></stimulsoft-viewer-angular>
-  [(state)]="windowState"
-  *ngIf="openedPrintOrder"
-  (close)="openClosePrintOrder(false)"
->
-  <stimulsoft-viewer-angular
-    [requestUrl]="urlPrintOrder"
-    [action]="'InitViewerOrder'"
-    [width]="'95%'"
-    [height]="'800px'"
-  ></stimulsoft-viewer-angular>
 </kendo-window>
 
-<kendo-window
+<kendo-window [top]="100" [left]="50" title="Recibo de PIX" [(state)]="windowState" *ngIf="openedPrintReceivePix"
-  [top]="100"
+  (close)="closePrintReceivePix('Não')">
-  [left]="50"
+  <stimulsoft-viewer-angular [requestUrl]="urlPrintCreditPix" [action]="'InitViewerComprovantePix'" [width]="'95%'"
-  title="Recibo de PIX"
+    [height]="'800px'"></stimulsoft-viewer-angular>
-  [(state)]="windowState"
-  *ngIf="openedPrintReceivePix"
-  (close)="closePrintReceivePix('Não')"
->
-  <stimulsoft-viewer-angular
-    [requestUrl]="urlPrintCreditPix"
-    [action]="'InitViewerComprovantePix'"
-    [width]="'95%'"
-    [height]="'800px'"
-  ></stimulsoft-viewer-angular>
 </kendo-window>
 
-<kendo-dialog
+<kendo-dialog title="Recebimento via PIX" animation="zoom" *ngIf="showReceivePix" (close)="closeReceivePix('Cancelar')"
-  title="Recebimento via PIX"
+  [minWidth]="250" [width]="450">
-  animation="zoom"
-  *ngIf="showReceivePix"
-  (close)="closeReceivePix('Cancelar')"
-  [minWidth]="250"
-  [width]="450"
->
   <div *ngIf="!showQrCode">
     <form class="k-form" [formGroup]="formReceivePix">
       <kendo-formfield showHints="initial">
@@ -364,11 +238,7 @@
     </div>
     <div class="row w-100 mb-3">
       <div class="col-12">
-        <kendo-textbox
+        <kendo-textbox readonly="true" [value]="qrCodePix" [selectOnFocus]="true"></kendo-textbox>
-          readonly="true"
-          [value]="qrCodePix"
-          [selectOnFocus]="true"
-        ></kendo-textbox>
       </div>
     </div>
     <kendo-dialog-actions>