TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 19:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'build-300' into 'master'

Browse Source 
fix payment issue & build version 300

See merge request mohit.panjvani/crater-web!150
This commit is contained in:
Mohit Panjwani
2020-01-06 09:16:49 +00:00
parent f5b9bc95c6 d9b175a676
commit 06b035d9ac
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/assets/js/app.js
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -1,4 +1,4 @@
{ {
"/assets/js/app.js": "/assets/js/app.js?id=52488ee407fb4224bf0c", "/assets/js/app.js": "/assets/js/app.js?id=e211851ed84790fee286",
"/assets/css/crater.css": "/assets/css/crater.css?id=2123fdc939165f025e3b" "/assets/css/crater.css": "/assets/css/crater.css?id=2123fdc939165f025e3b"
} }

2
resources/assets/js/views/payments/Create.vue
View File

@ -363,7 +363,7 @@ export default {
let data = { let data = {
editData: { editData: {
...this.formData, ...this.formData,
payment_method_id: this.formData.payment_method.id, payment_method_id: this.formData.payment_method ? this.formData.payment_method.id : null,
payment_date: moment(this.formData.payment_date).format('DD/MM/YYYY') payment_date: moment(this.formData.payment_date).format('DD/MM/YYYY')
}, },
id: this.$route.params.id id: this.$route.params.id

2
resources/views/app/pdf/payment/payment.blade.php
View File

@ -503,7 +503,7 @@
</tr> </tr>
<tr> <tr>
<td class="textStyle1" style="text-align: left; color: #55547A">Payment Mode</td> <td class="textStyle1" style="text-align: left; color: #55547A">Payment Mode</td>
<td class="textStyle2"> &nbsp;{{$payment->paymentMethod->name}}</td> <td class="textStyle2"> &nbsp;{{$payment->paymentMethod ? $payment->paymentMethod->name : '-'}}</td>
</tr> </tr>
@if ($payment->invoice && $payment->invoice->invoice_number) @if ($payment->invoice && $payment->invoice->invoice_number)
<tr> <tr>