+
@@ -61,10 +61,13 @@
-
Make Payment
+
Make Payment
Generate Summary Invoice
+
+
+
@@ -106,17 +109,17 @@
return Object.keys(new_object).reduce(function(total, key) {
return total + Math.round(new_object[key].amount * 100) / 100;
}, 0).toFixed(2);
- }
+ },
+ selectedIds () {
+ return this.selectedInvoice.map(s=>s.id);
+ },
},
methods: {
generateSummaryInvoice(){
- var selectedId = this.selectedInvoice.map(s=>s.id);
- window.open(route('invoice.combined_summary', JSON.stringify(selectedId)), '_blank');
+ window.open(route('invoice.combined_summary', JSON.stringify(this.selectedIds)), '_blank');
},
makePayment(){
- var selectedId = this.selectedInvoice.map(s=>s.id);
- // window.open(route('invoice.combined_summary', JSON.stringify(selectedId)), '_blank');
- console.log(selectedId);
+ this.submit(this.route('api.transaction.group.create', JSON.stringify(this.selectedId)), 'post', this.section, true, false);
},
updateList(packageList){
this.selectedInvoice.includes(packageList) ? this.selectedInvoice.splice(this.selectedInvoice.indexOf(packageList), 1) : this.selectedInvoice.push(packageList);
diff --git a/resources/assets/vue/components/paymentsBilling/forms/GroupPaymentFormComponent.vue b/resources/assets/vue/components/paymentsBilling/forms/GroupPaymentFormComponent.vue
new file mode 100644
index 00000000..74bfffda
--- /dev/null
+++ b/resources/assets/vue/components/paymentsBilling/forms/GroupPaymentFormComponent.vue
@@ -0,0 +1,224 @@
+
+
+
+
+
+
Make Payment
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
Online Banking
+
+
+
+
+
+
+
{{$store.getters.isShowing('otherPaymentMethods') ? 'Hide' : 'Show'}} Alternative Methods
+
+
+
+
+
+
+
You can proceed by bank in {{(Math.round((parseFloat(parameters.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}} MYR to the bank account detailed below and upload your payment proof to proceed with your transfer after clicking on the proceed button below.
+
+
+
+
+
+
+
+
CIEF WORLDWIDE SDN. BHD.
+
+
+
+
+
Maybank: 562237009234
+
+
+
+
+
Bank In Amount: {{(Math.round((parseFloat(parameters.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}} MYR
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue b/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue
index 3554a8f2..c8ca6e17 100644
--- a/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue
+++ b/resources/assets/vue/components/settings/elements/CurrenciesListComponent.vue
@@ -75,9 +75,9 @@
+
{{item.created_at}}
{{[5, 9].includes(parseFloat(item.type)) ? (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}
-
{{[1, 11].includes(parseFloat(item.type)) ? '- ' + (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}
+
{{[2, 11].includes(parseFloat(item.type)) ? '- ' + (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}
{{remainingBalance(index)}}
@@ -136,7 +136,7 @@ export default {
if(this.wallet){
let transactions = this.wallet.transactions.slice().reverse();
transactions.slice(0, transactions.length - index).map(function(transaction) {
- [1, 11].includes(transaction.type) ? tempBalance -= (transaction.amount) : tempBalance += (transaction.amount);
+ [2, 11].includes(transaction.type) ? tempBalance -= (transaction.amount) : tempBalance += (transaction.amount);
return tempBalance
}, 0);
}
diff --git a/routes/transaction.php b/routes/transaction.php
index 667a3f68..415eb4de 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -35,4 +35,13 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
// Route::post('booking/{id}/details/update', 'CreatePurchaseOrderTransactionController@create')->name('po.create');
+ Route::group(['prefix' => 'groups', 'as' => 'group.'], function () {
+ Route::post('/{transaction_ids}/create', 'CreateGroupsController@create')->name('create');
+ Route::get('/list', 'ListGroupsController@list')->name('list');
+ Route::delete('/{id}/delete', 'DeleteGroupController@delete')->name('delete');
+ Route::put('/{id}/update', 'UpdateGroupController@update')->name('update');
+ // Route::post('/{id}/approve', 'CreateBulkPurchaseOrderDocumentController@aprove')->name('approve');
+ // Route::post('/bulk/po', 'CreateBulkPurchaseOrderDocumentController@create')->name('bulk.po');
+ });
+
});
\ No newline at end of file