Skip to content

Commit 0ca9178

Browse files
committed
update
1 parent f529744 commit 0ca9178

File tree

9 files changed

+15
-13
lines changed

9 files changed

+15
-13
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "enab",
3-
"version": "1.5.8",
3+
"version": "1.5.9",
44
"description": "Enab System",
55
"main": "./dist/main/index.js",
66
"scripts": {

src/renderer/components/Business.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ export default {
100100
this.selectBusiness({ name: this.name, title: this.title });
101101
102102
// Clear Storage
103-
window.localStorage.
104103
window.localStorage.clear();
105104
} else {
106105
this.sendCreateBusiness();

src/renderer/components/Utilities/TitleBarManagement.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<script>
1616
const { remote } = require("electron");
17-
var win = remote.BrowserWindow.getFocusedWindow();
17+
const win = remote.BrowserWindow.getFocusedWindow();
1818
1919
export default {
2020
methods: {

src/renderer/components/supermarket/Customers/customer.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div class="col-xl-12 col-md-12 d-flex align-items-center">
1616
<div class="row w-100">
1717
<div class="col-4 t-1-h p-3 r-2 text-center">
18-
<h1 class="fs-1 text-light">300$</h1>
18+
<h1 class="fs-1 text-light">{{$n(ordersTotal, 'currency')}}</h1>
1919
<span class="fs-5">إجمالي الطلبات</span>
2020
</div>
2121
<div class="col-4 t-1-h p-3 r-2 text-center">
@@ -37,7 +37,7 @@
3737
<c-tab>النشاطات</c-tab>
3838
</c-tab-list>
3939

40-
<c-tab-panels class="mt-2 t-1 r-2 p-2">
40+
<c-tab-panels class="mt-2 t-1 r-2 p-3">
4141
<c-tab-panel>
4242
<SupermarketCustomersOrders :orders="orders" />
4343
</c-tab-panel>
@@ -71,6 +71,10 @@ export default {
7171
this.id
7272
);
7373
},
74+
75+
ordersTotal() {
76+
return this.orders.reduce((a, b) => +a + +b.total_price, 0);
77+
},
7478
},
7579
};
7680
</script>

src/renderer/components/supermarket/Customers/orders.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ export default {
9292
this.show = false;
9393
},
9494
getProducts: function (products) {
95-
console.log(products)
9695
this.showProducts = products;
9796
},
9897
},

src/renderer/components/supermarket/Home/Ads.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div v-else>
88
<b-carousel id="carousel-fade" style="text-shadow: 0px 0px 2px #000" class="mb-3" fade indicators img-width="1024" img-height="480">
99
<a v-for="ad in ads" :key="ad.id" :href="ad.url" target="_blank">
10-
<b-carousel-slide :img-src="ad.image"></b-carousel-slide>
10+
<b-carousel-slide :img-src="'https://api.enab.app/storage/' + ad.image"></b-carousel-slide>
1111
</a>
1212
</b-carousel>
1313
</div>
@@ -25,7 +25,7 @@ export default {
2525
}),
2626
},
2727
async created() {
28-
await this.fetchAds(this.$auth.user.supermarket.id);
28+
await this.fetchAds("supermarket");
2929
this.loading = false
3030
},
3131
data() {

src/renderer/components/supermarket/control/customers.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
<td class="align-middle">{{ customer.phonenumber }}</td>
8585
<td class="align-middle">{{ customer.location }}</td>
8686
<td class="align-middle">
87-
<c-button v-if="customer.id !== 0" variant-color="gray" size="xs" @click="selectedCustomer = customer.id" variant="ghost">
88-
<i class="fas fa-eye"></i>
87+
<c-button v-if="customer.id !== 0" size="xs" @click="selectedCustomer = customer.id" variant="ghost">
88+
<i class="fas fa-eye text-dark"></i>
8989
</c-button>
9090
<c-button v-if="customer.id !== 0" variant-color="blue" size="xs" @click="thisData = getCustomer(customer.id), editState = true, show = true" variant="ghost">
9191
<i class="fas fa-pen"></i>

src/renderer/components/supermarket/control/orders.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
<td class="align-middle">{{ $n(order.total_price, 'currency') }}</td>
7979
<td class="align-middle">{{ order.user.name }}</td>
8080
<td class="align-middle">
81-
<c-button variant-color="gray" size="xs" @click="getProducts(order.products), show = true" variant="ghost">
82-
<i class="fas fa-eye"></i>
81+
<c-button size="xs" @click="getProducts(order.products), show = true" variant="ghost">
82+
<i class="fas fa-eye text-dark"></i>
8383
</c-button>
8484
</td>
8585
</tr>

src/renderer/plugins/theme.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
2: "#00000080",
1818
3: "#000000b0"
1919
},
20-
gray: "#4A5568"
20+
// gray: "#4A5568"
2121
},
2222
borderColor: {
2323
...this.colors

0 commit comments

Comments
 (0)