dev #13482

angular.json

@@ -82,8 +82,8 @@
               "browserTarget": "selfdelivery-admin-panel:build:production"
             },
             "development": {
-              "browserTarget": "selfdelivery-admin-panel:build:development"
+              "browserTarget": "selfdelivery-admin-panel:build:development",
-              //"proxyConfig": "proxy.confi.json"
+              "proxyConfig": "proxy.confi.json"
             }
           },
           "defaultConfiguration": "development"
@@ -95,6 +95,61 @@
           }
         },
         "test": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/selfdelivery-admin-panel",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
+            "inlineStyleLanguage": "scss",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "node_modules/primeng/resources/themes/bootstrap4-light-blue/theme.css",
+              "node_modules/primeicons/primeicons.css",
+              "node_modules/primeng/resources/primeng.min.css",
+              "./node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
+              "src/styles.scss"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "4mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
+                }
+              ],
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.test.ts"
+                }
+              ],
+              "outputHashing": "all"
+            },
+            "development": {
+              "buildOptimizer": false,
+              "optimization": false,
+              "vendorChunk": true,
+              "extractLicenses": false,
+              "sourceMap": true,
+              "namedChunks": true
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "test2": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
             "main": "src/test.ts",

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
+    "start": "ng serve --proxy-config proxy.confi.json",
     "build": "ng build",
     "watch": "ng build --watch --configuration development",
     "test": "ng test"

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

@@ -36,7 +36,7 @@
       <!--*ngIf="color()" style="color: red" [ngClass]="{ui-button-danger: true}"-->
       <tr (click)="vievOrder(order.id)" #ordtable style="cursor: pointer">
         <td id="order">{{order.id}}</td>
-        <td [ngClass]="{'red': order.item_style == 'red','orange': order.item_style == 'orange','green': order.item_style == 'green','grey': order.item_style == 'grey','yellow': order.item_style == 'yellow','blue': order.item_style == 'blue','lilac': order.item_style == 'lilac'}">{{order.status_h}}</td>
+        <td [ngClass]="{'red': order.item_style == 'red','orange': order.item_style == 'orange','green': order.item_style == 'green','grey': order.item_style == 'grey','yellow': order.item_style == 'yellow','blue': order.item_style == 'blue','lilac': order.item_style == 'lilac', 'pink': order.item_style == 'pink'}">{{order.status_h}}</td>
         <td>{{order.address.name}}</td>
         <td>{{order.date_created | date:'HH:mm dd.MM.yyyy'}}</td>
         <td>{{order.due_datetime | date:'HH:mm dd.MM.yyyy'}}</td>
@@ -86,6 +86,7 @@
               <option>Новый</option>
               <option>Выдан</option>
               <option>Нужен возврат</option>
+              <option>Напечатан</option>
             </select>
           </td>
         </tr>

src/app/pages/orders/orders.component.scss

@@ -38,6 +38,11 @@ button:disabled {
   background-color: #ebc4eb;
 }
 
+.pink {
+  color: #ff00ff !important;
+  background-color: #ffabe3;
+}
+
 p-table {
   height: auto;
   overflow: scroll

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

@@ -52,7 +52,8 @@ export class OrdersComponent implements OnInit {
    "Оплата просрочена",
    "Новый",
    "Выдан",
-   "Нужен возврат"
+   "Нужен возврат",
+   "Чек напечатан"
   ];
 
 
@@ -128,7 +129,8 @@ export class OrdersComponent implements OnInit {
             "paymentOverdue",
             "newOrder",
             "issued",
-            "needReturnPayment"
+            "needReturnPayment",
+            "printedCheck",
           ]
         }
       }, RpcService.authService, false)
@@ -372,6 +374,9 @@ notif2() {
       if (item.status_h == 'Выдан') {
         item.item_style = 'lilac'
       };
+      if (item.status_h == 'Напечатан') {
+        item.item_style = 'pink'
+      };
     }
   }
 

src/environments/environment.test.ts

@@ -0,0 +1,6 @@
+export const environment = {
+    production: true,
+    appSelfDeliveryEndPoint: 'http://selfdelivery-pitsburg-test.mydatahosting.ru/api',
+    systemId: 'dfe16ca16a3598b812',
+  };
+