Skip to content

Commit

Permalink
Merge pull request #3429 from ColoredCow/feat/invoice-details
Browse files Browse the repository at this point in the history 
#3430 / Invoice details content alignments.
  • Loading branch information
@GauravGusain98
GauravGusain98 authored Feb 27, 2024
2 parents e4f14dc + cbeecf9 commit c4beb4f
Showing 1 changed file with 25 additions and 25 deletions.
50 changes: 25 additions & 25 deletions Modules/Invoice/Resources/views/subviews/edit/invoice-details.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<div class="form-group">
<div class="d-flex">
<label for="client_id font-weight-bold" class="mr-5">Client:</label>
<label for="client_id font-weight-bold" class="mr-3 w-90">Client:</label>
<span>
<p>{{ $invoice->client->name }}</p>
</span>
Expand All @@ -34,7 +34,7 @@

<div class="form-group">
<div class="d-flex">
<label for="client_id" class="mr-5">Project:</label>
<label for="client_id" class="mr-3 w-90">Project:</label>
<span>
<p>{{ optional($invoice->project)->name ?: $invoice->client->name . ' Projects' }}</p>
</span>
Expand All @@ -43,7 +43,7 @@

<div class="form-group">
<div class="d-flex">
<label for="client_id" class="mr-5">Amount:</label>
<label for="client_id" class="mr-3 w-90">Amount:</label>
<span>
<p>{{ $invoice->display_amount }}</p>
</span>
Expand All @@ -52,7 +52,7 @@

<div class="form-group" v-if="this.client.type == 'indian'">
<div class="d-flex">
<label for="client_id" class="mr-5">GST:</label>
<label for="client_id" class="mr-3 w-90">GST:</label>
<span>
<p>{{ $invoice->gst . ' ₹' }}</p>
</span>
Expand All @@ -61,7 +61,7 @@

<div class="form-group">
<div class="d-flex">
<label for="client_id" class="mr-5">Sent on:</label>
<label for="client_id" class="mr-3 w-90">Sent on:</label>
<span>
<p>{{ $invoice->sent_on->format(config('invoice.default-date-format')) }}</p>
</span>
Expand All @@ -70,15 +70,15 @@

<div class="form-group">
<div class="d-flex">
<label for="client_id" class="mr-5">Due on:</label>
<label for="client_id" class="mr-3 w-90">Due on:</label>
<span>
<p>{{ $invoice->due_on->format(config('invoice.default-date-format')) }}</p>
</span>
</div>
</div>

<div class="form-group d-flex">
<label for="receivable_date" class="field-required mr-3 pt-2">Receivable date</label>
<label for="receivable_date" class="field-required mr-3 w-md-90 w-xl-auto pt-2">Receivable <br> date</label>
<input type="date" class="form-control flex-1" name="receivable_date" id="receivable_date"
required="required" value="{{ $invoice->receivable_date->format('Y-m-d') }}">
</div>
Expand All @@ -92,14 +92,14 @@
</div>

<div class="form-group d-flex">
<label for="amountPaid" class="field-required mr-3 pt-1">Received Amount</label>
<label for="amountPaid" class="field-required w-145 mr-4 pt-1">Received Amount</label>
<div class="input-group flex-1">
<input v-model="amountPaid" type="number" class="form-control" name="amount_paid"
<input v-model="amountPaid" type="number" class="form-control ml-auto" name="amount_paid"
id="amountPaid" placeholder="Amount Received" required="required" step=".01"
min="0" v-on:input="changePaidAmountListener">
<div class="input-group-prepend">
<select name="currency_transaction_charge" v-model="currencyTransactionCharge"
id="currencyTransactionCharge" class="input-group-text" required="required">
id="currencyTransactionCharge" class="input-group-text h-xl-44" required="required">
@foreach ($countries as $country)
<option value="{{ $country->currency }}">{{ $country->currency }}</option>
@endforeach
Expand All @@ -109,56 +109,56 @@
</div>

<div class="form-group-inline d-flex mb-2">
<label for="payment_at" class="field-required mr-8 pt-1">Payment date</label>
<input type="date" class="form-control flex-1" name="payment_at" id="payment_at"
<label for="payment_at" class="field-required w-145 mr-4 pt-1">Payment date</label>
<input type="date" class="form-control w-200 w-xl-272 ml-auto flex-1" name="payment_at" id="payment_at"
required="required"
value="{{ $invoice->payment_at ? $invoice->payment_at->format('Y-m-d') : date('Y-m-d') }}">
</div>

<div class="form-group" v-if="this.client.type == 'indian'">
<div class="d-flex">
<label for="tds" class="mr-4 pt-1 field-required">TDS:</label>
<input type="text" name="tds" class="form-control w-272 ml-auto" v-model='tds'
<label for="tds" class="field-required w-145 mr-4 pt-1">TDS:</label>
<input type="text" name="tds" class="form-control w-200 w-xl-272 ml-auto" v-model='tds'
required="required">
</div>
</div>

<div class="form-group" v-if="this.client.type == 'indian'">
<div class="d-flex">
<label for="tds_percentage" class="mr-4 pt-1 field-required">TDS %:</label>
<input type="text" class="form-control w-272 ml-auto" name="tds_percentage"
<label for="tds_percentage" class="field-required w-145 mr-4 pt-1">TDS %:</label>
<input type="text" class="form-control w-200 w-xl-272 ml-auto" name="tds_percentage"
v-model='tdsPercentage' required="required">
</div>
</div>

<div class="form-group" v-if="this.client.type != 'indian'">
<div class="d-flex">
<label for="bank_charges" class="mr-4 pt-1 field-required">Bank Charges:</label>
<input type="number" class="form-control w-272 ml-auto" step="0.01" name="bank_charges"
<label for="bank_charges" class="field-required w-145 mr-4 pt-1">Bank Charges:</label>
<input type="number" class="form-control w-200 w-xl-272 ml-auto" step="0.01" name="bank_charges"
v-model='bankCharges' required="required">
</div>
</div>

<div class="form-group" v-if="this.client.type !== 'indian'">
<div class="d-flex">
<label for="conversion_rate" class="mr-4 pt-1">Current Conversion Rate:</label>
<input type="number" id="currentConversionRate" class="form-control w-272 ml-auto" step="0.01"
name="current_conversion_rate" value="{{$currencyService->getCurrentRatesInINR()}}" disabled>
<label for="conversion_rate" class="w-145 mr-4"><a target="_blank" href="https://www.google.co.in/search?q=conversion+rate+usd+to+inr">Today's Google Conversion Rate:</a></label>
<input type="number" id="currentConversionRate" class="form-control ml-auto w-200 w-xl-272 bg-white" step="0.01"
value="{{$currencyService->getCurrentRatesInINR()}}" disabled>
</div>
</div>

<div class="form-group" v-if="this.client.type !== 'indian'">
<div class="d-flex">
<label for="conversion_rate" class="mr-4 pt-1 field-required">Conversion Rate:</label>
<input type="number" id="conversionRate" class="form-control w-272 ml-auto" step="0.01"
<label for="conversion_rate" class="field-required w-145 mr-4 pt-1">Client Conversion Rate:</label>
<input type="number" id="conversionRate" class="form-control w-200 w-xl-272 ml-auto" step="0.01"
name="conversion_rate" v-model='conversionRate' required="required">
</div>
</div>

<div class="form-group" v-if="this.client.type !== 'indian'">
<div class="d-flex">
<label for="client_id" class="mr-4 pt-1 field-required">Conversion Rate Diff:</label>
<input type="number" class="form-control w-272 ml-auto" step="0.01"
<label for="client_id" class="field-required w-145 mr-4 pt-1">Conversion Rate Diff:</label>
<input type="number" class="form-control w-200 w-xl-272 ml-auto" step="0.01"
name="conversion_rate_diff" v-model='conversionRateDiff' required="required">
</div>
</div>
Expand Down

0 comments on commit c4beb4f

Please sign in to comment.