From 7d6587a5ffb53c5b0af067f491cbe5286bc45a55 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Tue, 13 May 2014 17:05:26 +0300 Subject: [PATCH] Redesign of the payment page --- app/views/master.blade.php | 51 ++++++--- app/views/payments/payment.blade.php | 161 ++++++++++++++++++--------- app/views/public/about_us.blade.php | 3 +- 3 files changed, 149 insertions(+), 66 deletions(-) diff --git a/app/views/master.blade.php b/app/views/master.blade.php index d14fb94801e8..69deab1f6b8f 100755 --- a/app/views/master.blade.php +++ b/app/views/master.blade.php @@ -51,24 +51,45 @@ - + - ga('create', '{{ $_ENV['ANALYTICS_KEY'] }}'); - ga('send', 'pageview'); - - function trackUrl(url) { - url = '/track' + url.replace('http:/', ''); - ga('send', 'pageview', url); - } + + @elseif (isset($_ENV['ANALYTICS_KEY']) && $_ENV['ANALYTICS_KEY']) + @else - function trackUrl(url) {} + @endif - + @yield('body') diff --git a/app/views/payments/payment.blade.php b/app/views/payments/payment.blade.php index f597999b0d49..7261ad0b2389 100755 --- a/app/views/payments/payment.blade.php +++ b/app/views/payments/payment.blade.php @@ -5,11 +5,11 @@ - {{ Former::open('payment/' . $invitationKey)->rules(array( + {{ Former::vertical_open('payment/' . $invitationKey)->rules(array( 'first_name' => 'required', 'last_name' => 'required', 'card_number' => 'required', @@ -24,66 +24,127 @@ 'phone' => 'required', 'email' => 'required' )) }} + {{ Former::populate($client) }} {{ Former::populateField('first_name', $contact->first_name) }} {{ Former::populateField('last_name', $contact->last_name) }} +

 

+

 

-
+
- {{ Former::legend('secure_payment') }} - {{ Former::text('first_name') }} - {{ Former::text('last_name') }} +
+
+ {{ Former::text('first_name') }} +
+
+ {{ Former::text('last_name') }} +
+
-

 

- - {{ Former::text('card_number') }} - {{ Former::select('expiration_month')->addOption('','') - ->addOption('01 - January', '1') - ->addOption('02 - February', '2') - ->addOption('03 - March', '3') - ->addOption('04 - April', '4') - ->addOption('05 - May', '5') - ->addOption('06 - June', '6') - ->addOption('07 - July', '7') - ->addOption('08 - August', '8') - ->addOption('09 - September', '9') - ->addOption('10 - October', '10') - ->addOption('11 - November', '11') - ->addOption('12 - December', '12') - }} - {{ Former::select('expiration_year')->addOption('','') - ->addOption('2014', '2014') - ->addOption('2015', '2015') - ->addOption('2016', '2016') - ->addOption('2017', '2017') - ->addOption('2018', '2018') - ->addOption('2019', '2019') - ->addOption('2020', '2020') - }} +

+
+ {{ Former::text('address1')->label('Street') }} +
+
- {{ Former::text('cvv') }} +
+
+ {{ Former::text('address2')->label('Apt/Suite') }} +
+
+ {{ Former::text('city') }} +
+
+ {{ Former::text('state')->label('State/Province') }} +
+
+ {{ Former::text('postal_code') }} +
+
-

 

- - {{ Former::text('address1')->label('Street') }} - {{ Former::text('address2')->label('Apt/Suite') }} - {{ Former::text('city') }} - {{ Former::text('state')->label('State/Province') }} - {{ Former::text('postal_code') }} - @if(strtolower($gateway->name) == 'beanstream') - {{ Former::select('country')->addOption('','')->label('Country') - ->fromQuery($countries, 'name', 'iso_3166_2') }} - {{ Former::text('phone') }} - {{ Former::text('email') }} - @endif - - {{ Former::actions( Button::primary_submit_lg(trans('texts.pay_now') . ' - ' . Utils::formatMoney($invoice->amount, $client->currency_id) )) }} +

+
+ {{ Former::text('phone') }} +
+
+ {{ Former::text('email') }} +
+
+ {{ Former::select('country')->addOption('','')->label('Country') + ->fromQuery($countries, 'name', 'iso_3166_2') }} +
+
+ @endif
-
+ +
+ +
+
+ {{ Former::text('card_number') }} +
+
+ + +
+
+ {{ Former::select('expiration_month')->addOption('','') + ->addOption('01 - January', '1') + ->addOption('02 - February', '2') + ->addOption('03 - March', '3') + ->addOption('04 - April', '4') + ->addOption('05 - May', '5') + ->addOption('06 - June', '6') + ->addOption('07 - July', '7') + ->addOption('08 - August', '8') + ->addOption('09 - September', '9') + ->addOption('10 - October', '10') + ->addOption('11 - November', '11') + ->addOption('12 - December', '12') + }} +
+
+ {{ Former::select('expiration_year')->addOption('','') + ->addOption('2014', '2014') + ->addOption('2015', '2015') + ->addOption('2016', '2016') + ->addOption('2017', '2017') + ->addOption('2018', '2018') + ->addOption('2019', '2019') + ->addOption('2020', '2020') + }} +
+
+ +
+
+ {{ Former::text('cvv') }} +
+
+ +
+ +

 

+

 

+ + +

+
+ + {{ Button::block_primary_submit_lg(strtoupper(trans('texts.pay_now')) . ' - ' . Utils::formatMoney($invoice->amount, $client->currency_id) ) }} + +
+
+ +
+ + + {{ Former::close() }} diff --git a/app/views/public/about_us.blade.php b/app/views/public/about_us.blade.php index 1e8b6a4e6ac6..f4ab58459278 100644 --- a/app/views/public/about_us.blade.php +++ b/app/views/public/about_us.blade.php @@ -15,7 +15,8 @@

What is Invoice Ninja?

-

Invoice Ninja is a free, open-source solution for invoicing and billing +

Invoice Ninja is a free, open-source solution for invoicing and billing customers. With Invoice Ninja, you can easily build and send beautiful invoices from any device that has access to the web. Your clients can print your invoices, download them as pdf files, and even pay you online from within the system.