Add order number to factor and make notif sound static

mrafei · Jul 15, 2020 · d386dc6 · d386dc6
1 parent aafbf28
commit d386dc6
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 10 deletions.
diff --git a/assets/audio/pristine.mp3 b/assets/audio/pristine.mp3
diff --git a/assets/printStyle.css b/assets/printStyle.css
@@ -43,6 +43,15 @@ body {
   padding-right: 10px;
   padding-left: 10px;
 }
+.px-1 {
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+.py-2 {
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
 
 .d-flex {
   display: flex;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vitrin-pos",
   "productName": "vitrin-pos",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Application for vitrin POS",
   "license": "Vitrin",
   "private": false,

diff --git a/src/components/ComponentToPrint/index.js b/src/components/ComponentToPrint/index.js
@@ -21,17 +21,29 @@ export default class ComponentToPrint extends React.Component {
         className="bg-white w-100 u-text-black printable px-3 u-fontVerySmall"
         style={{ minWidth: 300 }}>
         <div className="py-1 px-2 u-border-bottom-dark">
-          <div className="d-flex justify-content-between">
-            <div className="d-flex flex-column justify-content-center align-items-center">
-              {!printOptions.hideTitle && (
-                <div className="u-fontLarge u-fontWeightBold">{title}</div>
-              )}
-              <div className="mt-1">{englishNumberToPersianNumber(date)}</div>
-            </div>
+          <div className="d-flex justify-content-between align-items-center">
+            <span
+              className="d-flex px-1 py-2 flex-column justify-content-center align-items-center"
+              style={{ border: "1px solid black", height: "fit-content", borderRadius: 4 }}>
+              <span className="u-fontVerySmall">شماره فاکتور</span>
+              <span className="u-fontLarge u-fontWeightBold">
+                {englishNumberToPersianNumber(order.order_number) || "۱۰۱"}
+              </span>
+            </span>
+            {!printOptions.hideTitle && (
+              <div className="u-fontLarge text-center u-fontWeightBold" style={{ width: 160 }}>
+                {title}
+              </div>
+            )}
             {!printOptions.hideQR && <QRCode value={url} size={100} id="qr" />}
           </div>
         </div>
         <div className="d-flex flex-column justify-content-between px-3 pb-1">
+          <div className="mt-1">
+            <span>تاریخ و ساعت: </span>
+            <span className="u-fontWeightBold">{englishNumberToPersianNumber(date)}</span>
+          </div>
+
           {!printOptions.hideCustomerName && (
             <div className="mt-1">
               <span> مشترک گرامی: </span>
@@ -40,6 +52,7 @@ export default class ComponentToPrint extends React.Component {
               )}
             </div>
           )}
+
           {!printOptions.hideOrderNumber && (
             <div className="mt-1">
               <span>شماره سفارش: </span>

diff --git a/src/containers/pushNotification.js b/src/containers/pushNotification.js
@@ -1,5 +1,6 @@
 import { PUSH_NOTIFICATION_API } from "../../utils/api";
 import request from "../../utils/request";
+import pristine from "../../assets/audio/pristine.mp3";
 
 export default function initPushNotification(showSnackBar, history, updateOrders, siteDomain) {
   const { ipcRenderer, remote } = require("electron");
@@ -36,7 +37,7 @@ export default function initPushNotification(showSnackBar, history, updateOrders
       console.log("display notification", serverNotificationPayload);
       updateOrders();
       ipcRenderer.send("orderReceived", serverNotificationPayload.notification);
-      const audio = new Audio(`https://hs3-cf.behtarino.com/static/pristine.mp3`);
+      const audio = new Audio(pristine);
       audio.play();
     } else {
       // payload has no body, so consider it silent (and just consider the data portion)

diff --git a/webpack.build.config.js b/webpack.build.config.js
@@ -1,8 +1,8 @@
 const webpack = require('webpack')
 const path = require('path')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
-const BabiliPlugin = require('babili-webpack-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
+const SRC = path.resolve(__dirname, 'assets');
 
 // Any directories you will be adding code/files into, need to be added to this array so webpack will pick them up
 
@@ -55,6 +55,11 @@ module.exports = {
         test: /\.(eot|otf|ttf|woff|woff2)$/,
         use: 'file-loader'
       },
+      {
+        test: /\.mp3$/,
+        include: SRC,
+        loader: 'file-loader'
+      },
       {
         test: /\.svg$/,
         use: [

diff --git a/webpack.dev.config.js b/webpack.dev.config.js
@@ -2,6 +2,7 @@ const webpack = require('webpack');
 const path = require('path');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const { spawn } = require('child_process');
+const SRC = path.resolve(__dirname, 'assets');
 
 // Any directories you will be adding code/files into, need to be added to this array so webpack will pick them up
 
@@ -54,6 +55,11 @@ module.exports = {
         test: /\.(eot|otf|ttf|woff|woff2)$/,
         use: 'file-loader'
       },
+      {
+        test: /\.mp3$/,
+        include: SRC,
+        loader: 'file-loader'
+      },
       {
         test: /\.svg$/,
         use: [