diff --git a/public/css/custom.css b/public/css/custom.css index 91fb421dc..13a4ed019 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -165,20 +165,6 @@ button:focus { overflow: hidden; } -/*--------Customer/Vendor Show--------*/ -.show-transaction-card-header { - padding: 1.14rem; -} - -.show-transaction-card-footer { - padding: 1.15rem; -} - -.edit-sv { - margin-bottom: 30px; -} -/*--------Customer/Vendor Show Finish--------*/ - /*--------Navbar Notification--------*/ .nav-link .badge-update { position: absolute; diff --git a/resources/views/purchases/vendors/show.blade.php b/resources/views/purchases/vendors/show.blade.php index 725e882c8..b789bb85c 100644 --- a/resources/views/purchases/vendors/show.blade.php +++ b/resources/views/purchases/vendors/show.blade.php @@ -5,53 +5,76 @@ @section('content')
-
-
- {{ trans_choice('general.bills', 2) }} {{ $counts['bills'] }} -
+
+ @stack('vendor_transactions_count_start') +
  • + {{ trans_choice('general.transactions', 2) }} + {{ $counts['transactions'] }} +
    • + @stack('vendor_transactions_count_end') + -
    -
    -

    {{ trans('auth.profile') }}

    -
    +
    + @stack('vendor_phone_start') +
  • +
    {{ trans('general.phone') }}
    +
    {{ $vendor->phone }}
    +
    • + @stack('vendor_phone_end') -
    -
    -

    {{ trans('general.address') }}

    -
    + @stack('vendor_website_start') +
  • +
    {{ trans('general.website') }}
    +
    {{ $vendor->website }}
    +
    • + @stack('vendor_website_end') -
    - - {{ $vendor->address }} -

    -
    -
    + @stack('vendor_tax_number_start') +
  • +
    {{ trans('general.tax_number') }}
    +
    {{ $vendor->tax_number }}
    +
    • + @stack('vendor_tax_number_end') -     {{ trans('general.edit') }} + @stack('vendor_address_start') +
  • +
    {{ trans('general.address') }}
    +
    {{ $vendor->address }}
    +
    • + @stack('vendor_address_end') + + @if ($vendor->reference) + @stack('vendor_reference_start') +
  • +
    {{ trans('general.reference') }}
    +
    {{ $vendor->reference }}
    +
    • + @stack('vendor_reference_end') + @endif + + + @stack('vendor_edit_button_start') + {{ trans('general.edit') }} + @stack('vendor_edit_button_end')
    + @stack('vendor_paid_card_start')
    @@ -65,7 +88,9 @@
    + @stack('vendor_paid_card_end') + @stack('vendor_open_card_start')
    @@ -79,7 +104,9 @@
    + @stack('vendor_open_card_end') + @stack('vendor_overdue_card_start')
    @@ -93,57 +120,64 @@
    + @stack('vendor_overdue_card_end')
    - -
    +
    -
    + @stack('vendor_transactions_content_start') +
    - +
    - - - - + + + + @foreach($transactions as $item) - - - - + + + + @endforeach
    {{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.categories', 1) }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.categories', 1) }}{{ trans_choice('general.accounts', 1) }}
    @date($item->paid_at)@money($item->amount, $item->currency_code, true){{ $item->category ? $item->category->name : trans('general.na') }}{{ $item->account->name }}@date($item->paid_at)@money($item->amount, $item->currency_code, true){{ $item->category ? $item->category->name : trans('general.na') }}{{ $item->account->name }}
    -
    @include('partials.admin.pagination', ['items' => $transactions, 'type' => 'transactions'])
    + @stack('vendor_transactions_content_end') -
    + @stack('vendor_bills_content_start') +
    - +
    @@ -158,7 +192,7 @@ - + @@ -166,13 +200,13 @@
    {{ trans_choice('general.numbers', 1) }}
    {{ $item->bill_number }} @money($item->amount, $item->currency_code, true)@date($item->billed_at)@date($item->billd_at) @date($item->due_at) {{ trans('bills.statuses.' . $item->status) }}
    -
    @include('partials.admin.pagination', ['items' => $bills, 'type' => 'bills'])
    + @stack('vendor_bills_content_end')
    @@ -182,5 +216,5 @@ @endsection @push('scripts_start') - + @endpush diff --git a/resources/views/sales/customers/show.blade.php b/resources/views/sales/customers/show.blade.php index ab4b9ab1e..fc392737e 100644 --- a/resources/views/sales/customers/show.blade.php +++ b/resources/views/sales/customers/show.blade.php @@ -5,50 +5,76 @@ @section('content')
    -
    -
    - {{ trans_choice('general.invoices', 2) }} {{ $counts['invoices'] }} -
    -
    - {{ trans_choice('general.transactions', 2) }} {{ $counts['transactions'] }} -
    -
    + -
    -
    -

    {{ trans('general.address') }}

    -
    -
    - - {{ $customer->address }} - -
    -
    +
      + @stack('customer_email_start') +
    • +
      {{ trans('general.email') }}
      +
      {{ $customer->email }}
      +
      • + @stack('customer_email_end') - {{ trans('general.edit') }} + @stack('customer_phone_start') +
    • +
      {{ trans('general.phone') }}
      +
      {{ $customer->phone }}
      +
      • + @stack('customer_phone_end') + + @stack('customer_website_start') +
    • +
      {{ trans('general.website') }}
      +
      {{ $customer->website }}
      +
      • + @stack('customer_website_end') + + @stack('customer_tax_number_start') +
    • +
      {{ trans('general.tax_number') }}
      +
      {{ $customer->tax_number }}
      +
      • + @stack('customer_tax_number_end') + + @stack('customer_address_start') +
    • +
      {{ trans('general.address') }}
      +
      {{ $customer->address }}
      +
      • + @stack('customer_address_end') + + @if ($customer->reference) + @stack('customer_reference_start') +
    • +
      {{ trans('general.reference') }}
      +
      {{ $customer->reference }}
      +
      • + @stack('customer_reference_end') + @endif +
    + + @stack('customer_edit_button_start') + {{ trans('general.edit') }} + @stack('customer_edit_button_end')
    + @stack('customer_paid_card_start')
    @@ -62,7 +88,9 @@
    + @stack('customer_paid_card_end') + @stack('customer_open_card_start')
    @@ -76,7 +104,9 @@
    + @stack('customer_open_card_end') + @stack('customer_overdue_card_start')
    @@ -90,40 +120,47 @@
    + @stack('customer_overdue_card_end')
    -
    + @stack('customer_transactions_content_start') +
    - - - - + + + + @foreach($transactions as $item) - - - - + + + + @endforeach @@ -135,8 +172,10 @@ + @stack('customer_transactions_content_end') -
    + @stack('customer_invoices_content_start') +
    {{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.categories', 1) }}{{ trans_choice('general.accounts', 1) }}{{ trans('general.date') }}{{ trans('general.amount') }}{{ trans_choice('general.categories', 1) }}{{ trans_choice('general.accounts', 1) }}
    @date($item->paid_at)@money($item->amount, $item->currency_code, true){{ $item->category ? $item->category->name : trans('general.na') }}{{ $item->account->name }}@date($item->paid_at)@money($item->amount, $item->currency_code, true){{ $item->category ? $item->category->name : trans('general.na') }}{{ $item->account->name }}
    @@ -167,6 +206,7 @@ + @stack('customer_invoices_content_end')