+
+
+
+
@@ -116,6 +121,23 @@
this_this.invoice = response.data.data;
})
.catch(function (error) {});
+ },
+
+ printInvoice (invoiceId) {
+ var this_this = this;
+
+ this.$http.get('/api/invoices/' + invoiceId + '/download', { responseType: 'blob'})
+ .then(function(response) {
+ const url = window.URL.createObjectURL(new Blob([response.data]));
+ const link = document.createElement('a');
+
+ link.href = url;
+
+ link.setAttribute('download', 'invoice.pdf'); //or any other extension
+ document.body.appendChild(link);
+ link.click();
+ })
+ .catch(function (error) {});
}
}
}
@@ -150,6 +172,7 @@
.sale-section-content {
padding: 16px;
+ cursor: pointer;
}
}
@@ -171,6 +194,8 @@
.invoice-item-info {
display: block;
overflow: hidden;
+ margin-bottom: 10px;
+ border-bottom: 1px dotted #CCC;
> div {
margin-bottom: 8px;
diff --git a/packages/Webkul/PWA/src/Resources/assets/js/components/customers/account/sales/orders/view.vue b/packages/Webkul/PWA/src/Resources/assets/js/components/customers/account/sales/orders/view.vue
index 6bbf3c317..1f03270de 100644
--- a/packages/Webkul/PWA/src/Resources/assets/js/components/customers/account/sales/orders/view.vue
+++ b/packages/Webkul/PWA/src/Resources/assets/js/components/customers/account/sales/orders/view.vue
@@ -95,6 +95,11 @@
{{ order.formated_tax_amount }}
+
+ {{ $t('Discount') }}
+ - {{ order.formated_discount_amount }}
+
+
{{ $t('Total Paid') }}
{{ order.formated_grand_total_invoiced }}
@@ -109,12 +114,6 @@
{{ $t('Grand Total') }}
{{ order.formated_grand_total }}
-
-
diff --git a/packages/Webkul/PWA/src/Resources/assets/js/components/customers/account/sales/shipments/card.vue b/packages/Webkul/PWA/src/Resources/assets/js/components/customers/account/sales/shipments/card.vue
index 4b565a58d..bba1682db 100644
--- a/packages/Webkul/PWA/src/Resources/assets/js/components/customers/account/sales/shipments/card.vue
+++ b/packages/Webkul/PWA/src/Resources/assets/js/components/customers/account/sales/shipments/card.vue
@@ -4,7 +4,9 @@
{{ invoiceItem.name }}
+
+ {{ invoiceItem.sku }}
+
#{{ shipment.id }}
-
+
diff --git a/packages/Webkul/PWA/src/Resources/assets/js/components/customers/account/sales/shipments/view.vue b/packages/Webkul/PWA/src/Resources/assets/js/components/customers/account/sales/shipments/view.vue
index 447a2b559..98212286c 100644
--- a/packages/Webkul/PWA/src/Resources/assets/js/components/customers/account/sales/shipments/view.vue
+++ b/packages/Webkul/PWA/src/Resources/assets/js/components/customers/account/sales/shipments/view.vue
@@ -1,7 +1,7 @@
-
@@ -14,6 +14,9 @@
{{ shipmentItem.name }}
+
+ {{ shipmentItem.sku }}
+
@@ -91,12 +93,16 @@
return {
reviews: [],
- pagination: {}
+ pagination: {},
+
+ customer: null
}
},
mounted () {
this.getReviews(this.product.id);
+
+ this.getAuthCustomer();
},
computed: {
@@ -110,6 +116,20 @@
}
return ratingFinal;
+ },
+
+ getAuthCustomer () {
+ var this_this = this;
+
+ EventBus.$emit('show-ajax-loader');
+
+ this.$http.get('/api/customer/get')
+ .then(function(response) {
+ this_this.customer = response.data.data;
+
+ EventBus.$emit('hide-ajax-loader');
+ })
+ .catch(function (error) {});
}
},
diff --git a/packages/Webkul/PWA/src/Resources/assets/sass/admin-icon.scss b/packages/Webkul/PWA/src/Resources/assets/sass/admin-icon.scss
new file mode 100644
index 000000000..248957b54
--- /dev/null
+++ b/packages/Webkul/PWA/src/Resources/assets/sass/admin-icon.scss
@@ -0,0 +1,25 @@
+
+.pwa-icon {
+ width: 60px;
+ height: 55px;
+ display: inline-block;
+ background-size: cover;
+ background-image: url("../images/Icon-PWA.svg");
+}
+
+.bell-icon {
+ background-image: url("../images/Icon-bell.svg");
+ height: 24px;
+ width: 24px;
+}
+
+.router-link-active,
+.active {
+ .pwa-icon {
+ background-image: url("../images/Icon-PWA-Active.svg");
+ }
+
+ &.pwa-icon {
+ background-image: url("../images/Icon-PWA-Active.svg");
+ }
+}
\ No newline at end of file
diff --git a/packages/Webkul/PWA/src/Resources/assets/sass/admin.scss b/packages/Webkul/PWA/src/Resources/assets/sass/admin.scss
new file mode 100644
index 000000000..7010c18a7
--- /dev/null
+++ b/packages/Webkul/PWA/src/Resources/assets/sass/admin.scss
@@ -0,0 +1 @@
+@import "admin-icon";
\ No newline at end of file
diff --git a/packages/Webkul/PWA/src/Resources/lang/en/app.php b/packages/Webkul/PWA/src/Resources/lang/en/app.php
index 9404b189a..32784a8d0 100644
--- a/packages/Webkul/PWA/src/Resources/lang/en/app.php
+++ b/packages/Webkul/PWA/src/Resources/lang/en/app.php
@@ -6,6 +6,7 @@
'pwa' => 'PWA',
'settings' => 'Settings',
'general' => 'General',
+ 'push-notification' => 'Push Notification',
'name' => 'Name',
'short-name' => 'Short Name',
'theme-color' => 'Theme Color',
@@ -14,13 +15,15 @@
'small' => 'App Icon (48x48)',
'medium' => 'App Icon (96x96)',
'large' => 'App Icon (144x144)',
- 'extra-large' => 'App Icon (196x196)'
+ 'extra-large' => 'App Icon (196x196)',
+ 'topic' => 'Topic',
+ 'api-key' => 'Server API Key'
],
'layouts' => [
'push-notification' => 'Push Notification'
],
'push-notification' => [
- 'title' => 'Push Notification',
+ 'title' => 'Push Notification List',
'title-create' => 'Add Notification',
'title-edit' => 'Modity Notification',
'create-notification' => 'Create Push Notification',
@@ -30,7 +33,8 @@
'label-title' => 'Title',
'description' => 'Description',
'target-url' => 'Target URL',
- 'icon' => 'Icon'
+ 'icon' => 'Icon',
+ 'success-notification' => 'Success: Push notification sent successfully.'
],
'datagrid' => [
'id' => 'ID',
diff --git a/packages/Webkul/PWA/src/Resources/views/PushNotification/create.blade.php b/packages/Webkul/PWA/src/Resources/views/PushNotification/create.blade.php
index 968fcf2a8..4119f26bd 100644
--- a/packages/Webkul/PWA/src/Resources/views/PushNotification/create.blade.php
+++ b/packages/Webkul/PWA/src/Resources/views/PushNotification/create.blade.php
@@ -40,14 +40,22 @@
+
@{{ errors.first('targeturl') }}
-
-
-
- @{{ errors.first('icon') }}
+
diff --git a/packages/Webkul/PWA/src/Resources/views/PushNotification/edit.blade.php b/packages/Webkul/PWA/src/Resources/views/PushNotification/edit.blade.php
index 867a65f4f..6517bae7a 100644
--- a/packages/Webkul/PWA/src/Resources/views/PushNotification/edit.blade.php
+++ b/packages/Webkul/PWA/src/Resources/views/PushNotification/edit.blade.php
@@ -5,7 +5,7 @@
@stop
@section('content')
-
+
+
+