From d004f89b0e4bd149ef2235ec786a33006ca3424f Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Fri, 19 Jan 2018 07:13:02 +0200
Subject: [PATCH] Working on the portal

---
 resources/views/invited/dashboard.blade.php   | 12 +++---
 resources/views/invited/details.blade.php     | 41 ++-----------------
 .../views/payments/credit_card.blade.php      |  4 --
 3 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/resources/views/invited/dashboard.blade.php b/resources/views/invited/dashboard.blade.php
index c03a41bbde73..c966133bea2a 100644
--- a/resources/views/invited/dashboard.blade.php
+++ b/resources/views/invited/dashboard.blade.php
@@ -348,15 +348,17 @@
                         @include('payments.paymentmethods_list')
                     </div>
                 @endif
-                @if ($client->hasRecurringInvoices())
-                    <div class="pull-right">
+                <div class="pull-right">
+                    @if ($client->hasRecurringInvoices())
                         {!! Button::primary(strtoupper(trans("texts.recurring")))->asLinkTo(URL::to('/client/invoices/recurring')) !!}
-                        {!! Button::success(strtoupper(trans("texts.edit_details")))->asLinkTo(URL::to('/client/details')) !!}
-                    </div>
-                @endif
+                    @endif
+                    {!! Button::success(strtoupper(trans("texts.edit_details")))->asLinkTo(URL::to('/client/details')) !!}
+                </div>
             </div>
         </div>
 
+        <br/>
+
         <div class="row" id="account-row">
             <div class="col-md-2 invoices-from">
                 {{trans('texts.invoice_from')}}
diff --git a/resources/views/invited/details.blade.php b/resources/views/invited/details.blade.php
index c199e684a10e..d7a614af5b20 100644
--- a/resources/views/invited/details.blade.php
+++ b/resources/views/invited/details.blade.php
@@ -18,15 +18,13 @@
                     ->addClass('payment-form')
                     ->id('payment-form')
                     ->rules(array(
-                        'first_name' => 'required',
-                        'last_name' => 'required',
+                        'name' => 'required',
+                        'vat_number' => 'required',
                         'address1' => 'required',
                         'city' => 'required',
                         'state' => 'required',
                         'postal_code' => 'required',
                         'country_id' => 'required',
-                        'phone' => 'required',
-                        'email' => 'required|email',
                     )) !!}
 
 
@@ -37,11 +35,6 @@
                 {{ Former::populateField('email', $contact->email) }}
                 @if (!$client->country_id && $client->account->country_id)
                     {{ Former::populateField('country_id', $client->account->country_id) }}
-                    {{ Former::populateField('shipping_country_id', $client->account->country_id) }}
-                @endif
-                @if (!$client->currency_id && $client->account->currency_id)
-                    {{ Former::populateField('currency_id', $client->account->currency_id) }}
-                    {{ Former::populateField('currency', $client->account->currency->code) }}
                 @endif
             @endif
 
@@ -49,6 +42,7 @@
             <hr class="form-legend"/>
 
             <div style="padding-bottom: 22px;">
+
                 <div class="row">
                     <div class="col-md-6">
                         {!! Former::text('name')
@@ -65,35 +59,6 @@
                 </div>
             </div>
 
-
-            <h3>{{ trans('texts.contact_information') }}</h3>
-            <hr class="form-legend"/>
-
-            <div style="padding-bottom: 22px;">
-                <div class="row">
-                    <div class="col-md-6">
-                        {!! Former::text('first_name')
-                                ->placeholder(trans('texts.first_name'))
-                                ->label('') !!}
-                    </div>
-                    <div class="col-md-6">
-                        {!! Former::text('last_name')
-                                ->placeholder(trans('texts.last_name'))
-                                ->autocomplete('family-name')
-                                ->label('') !!}
-                    </div>
-                </div>
-
-                <div class="row" style="display:{{ isset($paymentTitle) || empty($contact->email) ? 'block' : 'none' }}">
-                    <div class="col-md-12">
-                        {!! Former::text('email')
-                                ->placeholder(trans('texts.email'))
-                                ->autocomplete('email')
-                                ->label('') !!}
-                    </div>
-                </div>
-            </div>
-
             <h3>{{ trans('texts.billing_address') }}</h3>
             <hr class="form-legend"/>
 
diff --git a/resources/views/payments/credit_card.blade.php b/resources/views/payments/credit_card.blade.php
index 32c34ee1d7aa..07a4e8c2a91e 100644
--- a/resources/views/payments/credit_card.blade.php
+++ b/resources/views/payments/credit_card.blade.php
@@ -155,10 +155,6 @@
             {{ Former::populateField('country_id', $client->account->country_id) }}
             {{ Former::populateField('shipping_country_id', $client->account->country_id) }}
         @endif
-        @if (!$client->currency_id && $client->account->currency_id)
-            {{ Former::populateField('currency_id', $client->account->currency_id) }}
-            {{ Former::populateField('currency', $client->account->currency->code) }}
-        @endif
     @endif
 
     @if (Utils::isNinjaDev())