Skip to content

Commit b2095da

Browse files
zabiremuzabiremu
committed
fixed date format issues in chalan
1 parent 9cf03c9 commit b2095da

File tree

4 files changed

+50
-49
lines changed

4 files changed

+50
-49
lines changed

‎resources/views/backend/chalan/clone.blade.php

+14-14
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<x-backend.ui.section-card style="box-shadow: none!important;">
112112

113113
<x-backend.ui.button type="custom" href="{{ route('chalan.index') }}"
114-
class="btn-dark btn-sm mb-2 d-print-none">Back</x-backend.ui.button>
114+
class="mb-2 btn-dark btn-sm d-print-none">Back</x-backend.ui.button>
115115

116116
<form action="{{ route('chalan.store') }}" method="post" class="chalan">
117117
@csrf
@@ -127,7 +127,7 @@ class="btn-dark btn-sm mb-2 d-print-none">Back</x-backend.ui.button>
127127
</div>
128128
</div>
129129
<div>
130-
<div class="d-block fs-3 fw-medium text-dark text-center">চালান ফরম</div>
130+
<div class="text-center d-block fs-3 fw-medium text-dark">চালান ফরম</div>
131131
<table class="mx-auto upper-table">
132132
<tbody>
133133
<tr>
@@ -137,21 +137,21 @@ class="btn-dark btn-sm mb-2 d-print-none">Back</x-backend.ui.button>
137137
<td class="text-center">
138138
চালান নংঃ
139139
<input name="chalan_no" type="text" value="{{ $chalan->chalan_no }}"
140-
class="dotted-border text-center" style="width: 4rem;" />
141-
তারিখঃ <input name="date" value="{{ $chalan->date->format('Y-m-d') }}" type="date"
142-
class="dotted-border">
140+
class="text-center dotted-border" style="width: 4rem;" />
141+
তারিখঃ <input name="date" value="{{ optional($chalan->date)->format('Y-m-d') }}"
142+
type="date" class="dotted-border">
143143
</td>
144144
</tr>
145145
<tr>
146146
<td class="text-center">বাংলাদেশ ব্যাংক/সোনালি ব্যাংকের চট্টগ্রাম জেলার
147-
<input type="text" class="dotted-border text-center" name="bank_name"
147+
<input type="text" class="text-center dotted-border" name="bank_name"
148148
value="{{ $chalan->bank_name }}">
149149
টাকা জমা দেওয়ার চালান
150150
</td>
151151
</tr>
152152
<tr>
153-
<td class="text-center py-2"> কোড নংঃ <x-backend.form.box-input name="code"
154-
value="{{ $chalan->code }}" :range="range(1, 13)" :has-space="true"/>
153+
<td class="py-2 text-center"> কোড নংঃ <x-backend.form.box-input name="code"
154+
value="{{ $chalan->code }}" :range="range(1, 13)" :has-space="true" />
155155
</td>
156156
</tr>
157157
</tbody>
@@ -240,7 +240,7 @@ class="text-capitalize">{{ $chalan->client?->company_name }}</span>
240240
<span>Purpose:</span> <input type="text" name="purpose" class="dotted-border"
241241
style="max-width: 8rem;" value="{{ $chalan->purpose }}" />
242242
</div>
243-
<div class="d-flex gap-1 align-items-center mb-2">
243+
<div class="gap-1 mb-2 d-flex align-items-center">
244244
<label for="year" class="d-inline">Year:</label>
245245
<select id="year" class="form-select d-inline" placeholder="Select Year..."
246246
name="year">
@@ -259,7 +259,7 @@ class="text-capitalize">{{ $chalan->client?->company_name }}</span>
259259
</div>
260260
</td>
261261
<td>
262-
<div class="d-flex gap-3 p-2">
262+
<div class="gap-3 p-2 d-flex">
263263
<div class="form-check form-check-success">
264264
<input class="form-check-input rounded-circle" type="radio" name="payment_type"
265265
value="cash" id="cash" @checked($chalan->payment_type === 'cash')>
@@ -292,7 +292,7 @@ class="text-capitalize">{{ $chalan->client?->company_name }}</span>
292292
$number = new \NumberFormatter('en_BD', \NumberFormatter::DEFAULT_STYLE);
293293
@endphp
294294
<input type="text" name="amount" value="{{ $number->parse($chalan->amount) }}"
295-
class="dotted-border mx-1" style="max-width: 6rem;" />
295+
class="mx-1 dotted-border" style="max-width: 6rem;" />
296296
</td>
297297
<td style="vertical-align: middle!important;">
298298
<span>.00</span>
@@ -308,7 +308,7 @@ class="dotted-border mx-1" style="max-width: 6rem;" />
308308
</tr>
309309
<tr>
310310
<td colspan="4" class="py-1">টাকা কথায়ঃ <input type="text" name="amount_in_words"
311-
value="{{ $chalan->amount_in_words }}" class="dotted-border mx-1 py-2 text-capitalize"
311+
value="{{ $chalan->amount_in_words }}" class="py-2 mx-1 dotted-border text-capitalize"
312312
style="width: 70%;" />
313313
<span class="float-end">
314314
মোট টাকাঃ
@@ -333,7 +333,7 @@ class="text-capitalize">{{ $chalan->amount_in_words }}</span>)
333333
</tr>
334334
<tr>
335335
<td colspan="6" style="vertical-align: middle;">
336-
তারিখঃ <span class="date">{{ $chalan->date->format('d/m/Y') }}</span>
336+
তারিখঃ <span class="date">{{ optional($chalan->date)->format('d/m/Y') }}</span>
337337
</td>
338338
</tr>
339339
</tbody>
@@ -359,7 +359,7 @@ class="text-capitalize">{{ $chalan->amount_in_words }}</span>)
359359
</li>
360360
</ul>
361361
</div>
362-
<x-backend.ui.button class="btn-primary btn btn-sm d-print-none text-white fw-bold"
362+
<x-backend.ui.button class="text-white btn-primary btn btn-sm d-print-none fw-bold"
363363
style="font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif!important;">Clone</x-backend.ui.button>
364364
</form>
365365
</x-backend.ui.section-card>

‎resources/views/backend/chalan/edit.blade.php

+14-14
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<x-backend.ui.section-card style="box-shadow: none!important;">
112112

113113
<x-backend.ui.button type="custom" href="{{ route('chalan.index') }}"
114-
class="btn-dark btn-sm mb-2 d-print-none">Back</x-backend.ui.button>
114+
class="mb-2 btn-dark btn-sm d-print-none">Back</x-backend.ui.button>
115115

116116
<form action="{{ route('chalan.update', $chalan->id) }}" method="post" class="chalan">
117117
@csrf
@@ -128,7 +128,7 @@ class="btn-dark btn-sm mb-2 d-print-none">Back</x-backend.ui.button>
128128
</div>
129129
</div>
130130
<div>
131-
<div class="d-block fs-3 fw-medium text-dark text-center">চালান ফরম</div>
131+
<div class="text-center d-block fs-3 fw-medium text-dark">চালান ফরম</div>
132132
<table class="mx-auto upper-table">
133133
<tbody>
134134
<tr>
@@ -138,21 +138,21 @@ class="btn-dark btn-sm mb-2 d-print-none">Back</x-backend.ui.button>
138138
<td class="text-center">
139139
চালান নংঃ
140140
<input name="chalan_no" type="text" value="{{ $chalan->chalan_no }}"
141-
class="dotted-border text-center" style="width: 4rem;" />
142-
তারিখঃ <input name="date" value="{{ $chalan->date->format('Y-m-d') }}" type="date"
143-
class="dotted-border">
141+
class="text-center dotted-border" style="width: 4rem;" />
142+
তারিখঃ <input name="date" value="{{ optional($chalan->date)->format('Y-m-d') }}"
143+
type="date" class="dotted-border">
144144
</td>
145145
</tr>
146146
<tr>
147147
<td class="text-center">বাংলাদেশ ব্যাংক/সোনালি ব্যাংকের চট্টগ্রাম জেলার
148-
<input type="text" class="dotted-border text-center" name="bank_name"
148+
<input type="text" class="text-center dotted-border" name="bank_name"
149149
value="{{ $chalan->bank_name }}">
150150
টাকা জমা দেওয়ার চালান
151151
</td>
152152
</tr>
153153
<tr>
154-
<td class="text-center py-2"> কোড নংঃ <x-backend.form.box-input name="code"
155-
value="{{ $chalan->code }}" :range="range(1, 13)" :has-space="true"/>
154+
<td class="py-2 text-center"> কোড নংঃ <x-backend.form.box-input name="code"
155+
value="{{ $chalan->code }}" :range="range(1, 13)" :has-space="true" />
156156
</td>
157157
</tr>
158158
</tbody>
@@ -241,7 +241,7 @@ class="text-capitalize">{{ $chalan->client?->company_name }}</span>
241241
<span>Purpose:</span> <input type="text" name="purpose" class="dotted-border"
242242
style="max-width: 8rem;" value="{{ $chalan->purpose }}" />
243243
</div>
244-
<div class="d-flex gap-1 align-items-center mb-2">
244+
<div class="gap-1 mb-2 d-flex align-items-center">
245245
<label for="year" class="d-inline">Year:</label>
246246
<select id="year" class="form-select d-inline" placeholder="Select Year..."
247247
name="year">
@@ -260,7 +260,7 @@ class="text-capitalize">{{ $chalan->client?->company_name }}</span>
260260
</div>
261261
</td>
262262
<td>
263-
<div class="d-flex gap-3 p-2">
263+
<div class="gap-3 p-2 d-flex">
264264
<div class="form-check form-check-success">
265265
<input class="form-check-input rounded-circle" type="radio" name="payment_type"
266266
value="cash" id="cash" @checked($chalan->payment_type === 'cash')>
@@ -293,7 +293,7 @@ class="text-capitalize">{{ $chalan->client?->company_name }}</span>
293293
$number = new \NumberFormatter('en_BD', \NumberFormatter::DEFAULT_STYLE);
294294
@endphp
295295
<input type="text" name="amount" value="{{ $number->parse($chalan->amount) }}"
296-
class="dotted-border mx-1" style="max-width: 6rem;" />
296+
class="mx-1 dotted-border" style="max-width: 6rem;" />
297297
</td>
298298
<td style="vertical-align: middle!important;">
299299
<span>.00</span>
@@ -309,7 +309,7 @@ class="dotted-border mx-1" style="max-width: 6rem;" />
309309
</tr>
310310
<tr>
311311
<td colspan="4" class="py-1">টাকা কথায়ঃ <input type="text" name="amount_in_words"
312-
value="{{ $chalan->amount_in_words }}" class="dotted-border mx-1 py-2 text-capitalize"
312+
value="{{ $chalan->amount_in_words }}" class="py-2 mx-1 dotted-border text-capitalize"
313313
style="width: 70%;" />
314314
<span class="float-end">
315315
মোট টাকাঃ
@@ -334,7 +334,7 @@ class="text-capitalize">{{ $chalan->amount_in_words }}</span>)
334334
</tr>
335335
<tr>
336336
<td colspan="6" style="vertical-align: middle;">
337-
তারিখঃ <span class="date">{{ $chalan->date->format('d/m/Y') }}</span>
337+
তারিখঃ <span class="date">{{ optional($chalan->date)->format('d/m/Y') }}</span>
338338
</td>
339339
</tr>
340340
</tbody>
@@ -360,7 +360,7 @@ class="text-capitalize">{{ $chalan->amount_in_words }}</span>)
360360
</li>
361361
</ul>
362362
</div>
363-
<x-backend.ui.button class="btn-primary btn btn-sm d-print-none text-white fw-bold"
363+
<x-backend.ui.button class="text-white btn-primary btn btn-sm d-print-none fw-bold"
364364
style="font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif!important;">Clone</x-backend.ui.button>
365365
</form>
366366
</x-backend.ui.section-card>

0 commit comments

Comments
 (0)