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 a1b28cd2675f..b37822c3e6c5 100644 --- a/app/views/public/about_us.blade.php +++ b/app/views/public/about_us.blade.php @@ -17,7 +17,7 @@

What is Invoice Ninja?

-

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.

+

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.

@@ -41,9 +41,9 @@ Shalom Stark

Shalom Stark

-

Co-Founder, CEO

+

Co-Founder, CEO

Twitter - Twitter + Website

Shalom has specialized in small business development for nearly 10 years. In addition to InvoiceNinja.com Shalom is CEO of a leading tour agency in Israel.

@@ -52,36 +52,41 @@ Hillel Coren

Hillel Coren

-

Co-Founder, CTO

-

Hillel has been developing enterprise applications for 15 years. His open-source AutoComplete component has been used by thousands of developers around the world.

-

Twitter - LinkedIn +

Co-Founder, CTO

+

Twitter + + Website

-

hillelcoren.com

+

Hillel has been developing enterprise applications for 15 years. His open-source AutoComplete component has been used by thousands of developers around the world.

- Razi Kantorp -

Razi Kantorp

-

Designer

-

Razi is a pixel nerd with a great deal of experience in design for web sites and applications. When she isn't busy with InvoiceNinja she runs a small web agency in Stockholm called kantorp-wegl.in

-

- -

+ Razi Kantorp +
+

Razi Kantorp-Weglin

+

Designer

+

Twitter + + Twitter + Website

-

kantorp-wegl.in

+ +

Razi is a pixel nerd with a great deal of experience in design for web sites and applications. When she isn't busy with InvoiceNinja she runs a small web agency in Stockholm called kantorp-wegl.in

- Ben Jacobsen +
+ Ben Jacobsen +

Ben Jacobson

-

Marketing

+

Marketing

+

Twitter + + Me + Website +

A veteran digital marketer and content strategist, Ben specializes in building communities around brands that make business easier for freelancers, SMBs and micro-entrepreneurs.

-

- - -

-

actionpackedmedia.com

diff --git a/app/views/public/header.blade.php b/app/views/public/header.blade.php index 9a5ae7497444..a7ea5b8bd820 100644 --- a/app/views/public/header.blade.php +++ b/app/views/public/header.blade.php @@ -23,11 +23,7 @@ background-image: url({{ asset('/images/hero-bg-1.jpg') }}); } .hero-about { -<<<<<<< HEAD background-image: url({{ asset('/images/hero-bg-3.jpg') }}); -======= - background-image: url({{ asset('/images/hero-bg-4.jpg') }}); ->>>>>>> upstream/master } .hero-plans { background-image: url({{ asset('/images/hero-bg-plans.jpg') }}); @@ -38,6 +34,9 @@ .hero-features { background-image: url({{ asset('/images/hero-bg-3.jpg') }}); } +.hero-secure { + background-image: url({{ asset('/images/hero-bg-secure-pay.jpg') }}); +} @stop @@ -114,10 +113,10 @@ -