Skip to content

Commit 118e397

Browse files
committed
Close #372 Make Printing Enabled For Effective
1 parent 3f3074a commit 118e397

File tree

6 files changed

+27
-5
lines changed

6 files changed

+27
-5
lines changed

config/nexopos.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
return [
3-
'version' => '4.6.4',
3+
'version' => '4.6.5',
44
'languages' => [
55
'en' => 'English',
66
'fr' => 'Français',

public/js/pos-init.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/pos.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/ts/popups/ns-pos-payment-popup.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export default {
111111
112112
nsSnackBar.success( result.message ).subscribe();
113113
114-
POS.printOrder( result.data.order.id );
114+
POS.printOrderReceipt( result.data.order );
115115
116116
// close payment popup
117117
this.$popup.close();

resources/ts/popups/ns-pos-pending-orders-popup.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export default {
8888
}, ( error ) => error );
8989
},
9090
printOrder( order ) {
91-
POS.printOrder( order.id );
91+
POS.printOrderReceipt( order );
9292
},
9393
proceedOpenOrder( order ) {
9494
const products = POS.products.getValue();

resources/ts/pos-init.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,28 @@ export class POS {
822822
this.products.next(products);
823823
}
824824

825+
printOrderReceipt( order ) {
826+
const options = this.options.getValue();
827+
828+
if (options.ns_pos_printing_enabled_for === 'disabled') {
829+
return false;
830+
}
831+
832+
/**
833+
* There should be a better
834+
* way of writing this.
835+
*/
836+
if ( options.ns_pos_printing_enabled_for === 'all_orders' ) {
837+
this.printOrder( order.id );
838+
} else if ( options.ns_pos_printing_enabled_for === 'partially_paid_orders' && [ 'paid', 'partially_paid' ].includes( order.payment_status ) ) {
839+
this.printOrder( order.id );
840+
} else if ( options.ns_pos_printing_enabled_for === 'only_paid_ordes' && [ 'paid' ].includes( order.payment_status ) ) {
841+
this.printOrder( order.id );
842+
} else {
843+
return false;
844+
}
845+
}
846+
825847
printOrder(order_id) {
826848
const options = this.options.getValue();
827849

0 commit comments

Comments
 (0)