Merge remote-tracking branch 'upstream/develop' into 2016-09-payments-changes

2024-11-08 12:12:48 +01:00 · 2016-09-15 11:40:53 -04:00 · 2016-09-15 11:40:53 -04:00 · 0fc2a4d323
commit 0fc2a4d323
parent 5af46cf1e9 e743af4d24
37 changed files with 889 additions and 80126 deletions
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@ -269,64 +269,68 @@ class InvoiceController extends BaseController
    private static function getViewModel($invoice)
    {
        $recurringHelp = '';
-        foreach (preg_split("/((\r?\n)|(\r\n?))/", trans('texts.recurring_help')) as $line) {
-            $parts = explode('=>', $line);
-            if (count($parts) > 1) {
-                $line = $parts[0].' => '.Utils::processVariables($parts[0]);
-                $recurringHelp .= '<li>'.strip_tags($line).'</li>';
-            } else {
-                $recurringHelp .= $line;
-            }
-        }
-
        $recurringDueDateHelp = '';
-        foreach (preg_split("/((\r?\n)|(\r\n?))/", trans('texts.recurring_due_date_help')) as $line) {
-            $parts = explode('=>', $line);
-            if (count($parts) > 1) {
-                $line = $parts[0].' => '.Utils::processVariables($parts[0]);
-                $recurringDueDateHelp .= '<li>'.strip_tags($line).'</li>';
-            } else {
-                $recurringDueDateHelp .= $line;
+        $recurringDueDates = [];
+
+        if ($invoice->is_recurring) {
+            foreach (preg_split("/((\r?\n)|(\r\n?))/", trans('texts.recurring_help')) as $line) {
+                $parts = explode('=>', $line);
+                if (count($parts) > 1) {
+                    $line = $parts[0].' => '.Utils::processVariables($parts[0]);
+                    $recurringHelp .= '<li>'.strip_tags($line).'</li>';
+                } else {
+                    $recurringHelp .= $line;
+                }
+            }
+
+            foreach (preg_split("/((\r?\n)|(\r\n?))/", trans('texts.recurring_due_date_help')) as $line) {
+                $parts = explode('=>', $line);
+                if (count($parts) > 1) {
+                    $line = $parts[0].' => '.Utils::processVariables($parts[0]);
+                    $recurringDueDateHelp .= '<li>'.strip_tags($line).'</li>';
+                } else {
+                    $recurringDueDateHelp .= $line;
+                }
+            }
+
+            // Create due date options
+            $recurringDueDates = [
+                trans('texts.use_client_terms') => ['value' => '', 'class' => 'monthly weekly'],
+            ];
+
+            $ends = ['th','st','nd','rd','th','th','th','th','th','th'];
+            for($i = 1; $i < 31; $i++){
+                if ($i >= 11 && $i <= 13) $ordinal = $i. 'th';
+                else $ordinal = $i . $ends[$i % 10];
+
+                $dayStr = str_pad($i, 2, '0', STR_PAD_LEFT);
+                $str = trans('texts.day_of_month', ['ordinal'=>$ordinal]);
+
+                $recurringDueDates[$str] = ['value' => "1998-01-$dayStr", 'data-num' => $i, 'class' => 'monthly'];
+            }
+            $recurringDueDates[trans('texts.last_day_of_month')] = ['value' => '1998-01-31', 'data-num' => 31, 'class' => 'monthly'];
+
+
+            $daysOfWeek = [
+                trans('texts.sunday'),
+                trans('texts.monday'),
+                trans('texts.tuesday'),
+                trans('texts.wednesday'),
+                trans('texts.thursday'),
+                trans('texts.friday'),
+                trans('texts.saturday'),
+            ];
+            foreach(['1st','2nd','3rd','4th'] as $i=>$ordinal){
+                foreach($daysOfWeek as $j=>$dayOfWeek){
+                    $str = trans('texts.day_of_week_after', ['ordinal' => $ordinal, 'day' => $dayOfWeek]);
+
+                    $day = $i * 7 + $j  + 1;
+                    $dayStr = str_pad($day, 2, '0', STR_PAD_LEFT);
+                    $recurringDueDates[$str] = ['value' => "1998-02-$dayStr", 'data-num' => $day, 'class' => 'weekly'];
+                }
            }
        }
-
-        // Create due date options
-        $recurringDueDates = [
-            trans('texts.use_client_terms') => ['value' => '', 'class' => 'monthly weekly'],
-        ];
-
-        $ends = ['th','st','nd','rd','th','th','th','th','th','th'];
-        for($i = 1; $i < 31; $i++){
-            if ($i >= 11 && $i <= 13) $ordinal = $i. 'th';
-            else $ordinal = $i . $ends[$i % 10];
-
-            $dayStr = str_pad($i, 2, '0', STR_PAD_LEFT);
-            $str = trans('texts.day_of_month', ['ordinal'=>$ordinal]);
-
-            $recurringDueDates[$str] = ['value' => "1998-01-$dayStr", 'data-num' => $i, 'class' => 'monthly'];
-        }
-        $recurringDueDates[trans('texts.last_day_of_month')] = ['value' => '1998-01-31', 'data-num' => 31, 'class' => 'monthly'];
-
-
-        $daysOfWeek = [
-            trans('texts.sunday'),
-            trans('texts.monday'),
-            trans('texts.tuesday'),
-            trans('texts.wednesday'),
-            trans('texts.thursday'),
-            trans('texts.friday'),
-            trans('texts.saturday'),
-        ];
-        foreach(['1st','2nd','3rd','4th'] as $i=>$ordinal){
-            foreach($daysOfWeek as $j=>$dayOfWeek){
-                $str = trans('texts.day_of_week_after', ['ordinal' => $ordinal, 'day' => $dayOfWeek]);
-
-                $day = $i * 7 + $j  + 1;
-                $dayStr = str_pad($day, 2, '0', STR_PAD_LEFT);
-                $recurringDueDates[$str] = ['value' => "1998-02-$dayStr", 'data-num' => $day, 'class' => 'weekly'];
-            }
-        }
-
+        
        // Tax rate $options
        $account = Auth::user()->account;
        $rates = TaxRate::scope()->orderBy('name')->get();
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@ -491,6 +491,7 @@ if (!defined('CONTACT_EMAIL')) {
    define('MAX_IFRAME_URL_LENGTH', 250);
    define('MAX_LOGO_FILE_SIZE', 200); // KB
    define('MAX_FAILED_LOGINS', 10);
+    define('MAX_INVOICE_ITEMS', env('MAX_INVOICE_ITEMS', 100));
    define('MAX_DOCUMENT_SIZE', env('MAX_DOCUMENT_SIZE', 10000));// KB
    define('MAX_EMAIL_DOCUMENTS_SIZE', env('MAX_EMAIL_DOCUMENTS_SIZE', 10000));// Total KB
    define('MAX_ZIP_DOCUMENTS_SIZE', env('MAX_EMAIL_DOCUMENTS_SIZE', 30000));// Total KB (uncompressed)
--- a/database/migrations/2016_09_05_150625_create_gateway_types.php
+++ b/database/migrations/2016_09_05_150625_create_gateway_types.php
@ -13,38 +13,42 @@ class CreateGatewayTypes extends Migration
    public function up()
    {
        Schema::dropIfExists('gateway_types');
-        Schema::create('gateway_types', function($t)
+        Schema::create('gateway_types', function($table)
        {
-            $t->increments('id');
-            $t->string('alias');
-            $t->string('name');
+            $table->increments('id');
+            $table->string('alias');
+            $table->string('name');
        });

        Schema::dropIfExists('account_gateway_settings');
-        Schema::create('account_gateway_settings', function($t)
+        Schema::create('account_gateway_settings', function($table)
        {
-            $t->increments('id');
+            $table->increments('id');

-            $t->unsignedInteger('account_id');
-            $t->unsignedInteger('user_id');
-            $t->unsignedInteger('gateway_type_id')->nullable();
+            $table->unsignedInteger('account_id');
+            $table->unsignedInteger('user_id');
+            $table->unsignedInteger('gateway_type_id')->nullable();

-            $t->timestamp('updated_at')->nullable();
+            $table->timestamp('updated_at')->nullable();


-            $t->unsignedInteger('min_limit')->nullable();
-            $t->unsignedInteger('max_limit')->nullable();
+            $table->unsignedInteger('min_limit')->nullable();
+            $table->unsignedInteger('max_limit')->nullable();

-            $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
-            $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
-            $t->foreign('gateway_type_id')->references('id')->on('gateway_types')->onDelete('cascade');
+            $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+            $table->foreign('gateway_type_id')->references('id')->on('gateway_types')->onDelete('cascade');

        });

-        Schema::table('payment_types', function($t)
+        Schema::table('payment_types', function($table)
        {
-            $t->unsignedInteger('gateway_type_id')->nullable();
-            $t->foreign('gateway_type_id')->references('id')->on('gateway_types')->onDelete('cascade');
+            $table->unsignedInteger('gateway_type_id')->nullable();
+        });
+
+        Schema::table('payment_types', function($table)
+        {
+            $table->foreign('gateway_type_id')->references('id')->on('gateway_types')->onDelete('cascade');
        });
    }
    /**
@ -54,10 +58,10 @@ class CreateGatewayTypes extends Migration
     */
    public function down()
    {
-        Schema::table('payment_types', function($t)
+        Schema::table('payment_types', function($table)
        {
-            $t->dropForeign('payment_types_gateway_type_id_foreign');
-            $t->dropColumn('gateway_type_id');
+            $table->dropForeign('payment_types_gateway_type_id_foreign');
+            $table->dropColumn('gateway_type_id');
        });

        Schema::dropIfExists('account_gateway_settings');
--- a/public/built.js
+++ b/public/built.js
--- a/public/built.js.map
+++ b/public/built.js.map
--- a/public/css/built.css
+++ b/public/css/built.css
--- a/public/css/built.css.map
+++ b/public/css/built.css.map
--- a/public/js/Chart.min.js.map
+++ b/public/js/Chart.min.js.map
--- a/resources/assets/css/colors.css
+++ b/resources/assets/css/colors.css
@ -47,7 +47,7 @@ thead th {
 }

 .sidebar-nav li {
-    border-bottom:solid 1px #4c4c4c;
+    border-bottom:solid 1px #444444;
 }

 .sidebar-nav i.fa {
@ -67,7 +67,7 @@ thead th {

 .sidebar-nav li:hover,
 .sidebar-nav li.active {
-    background: rgba(255,255,255,0.2);
+    background: rgba(255,255,255,0.1);
 }

 .menu-toggle {
--- a/resources/assets/css/sidebar.css
+++ b/resources/assets/css/sidebar.css
@ -110,6 +110,10 @@
        text-indent:0px
    }

+    #left-sidebar-wrapper ul {
+        min-height: 660px;
+    }
+
    .sidebar-nav li > a {
        display: block;
        text-decoration: none;
--- a/resources/lang/ca/texts.php
+++ b/resources/lang/ca/texts.php
@ -1392,6 +1392,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/cs/texts.php
+++ b/resources/lang/cs/texts.php
@ -1394,6 +1394,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/da/texts.php
+++ b/resources/lang/da/texts.php
@ -1392,6 +1392,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/de/texts.php
+++ b/resources/lang/de/texts.php
@ -1392,6 +1392,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Scheck',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Buchhaltung & Rechtswesen',
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@ -1392,6 +1392,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/es/texts.php
+++ b/resources/lang/es/texts.php
@ -1386,6 +1386,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/es_ES/texts.php
+++ b/resources/lang/es_ES/texts.php
@ -1385,6 +1385,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/fr/texts.php
+++ b/resources/lang/fr/texts.php
@ -1386,6 +1386,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/fr_CA/texts.php
+++ b/resources/lang/fr_CA/texts.php
--- a/resources/lang/hr/texts.php
+++ b/resources/lang/hr/texts.php
@ -1392,6 +1392,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/it/texts.php
+++ b/resources/lang/it/texts.php
@ -1386,6 +1386,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/ja/texts.php
+++ b/resources/lang/ja/texts.php
@ -1392,6 +1392,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/lt/texts.php
+++ b/resources/lang/lt/texts.php
@ -1392,6 +1392,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/nb_NO/texts.php
+++ b/resources/lang/nb_NO/texts.php
@ -1392,6 +1392,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/nl/texts.php
+++ b/resources/lang/nl/texts.php
@ -1383,6 +1383,13 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/pl/texts.php
+++ b/resources/lang/pl/texts.php
@ -1392,6 +1392,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/pt_BR/texts.php
+++ b/resources/lang/pt_BR/texts.php
@ -1383,6 +1383,13 @@ Quando tiver os valores dos depósitos, volte a esta pagina e complete a verific
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/sq/texts.php
+++ b/resources/lang/sq/texts.php
@ -1390,6 +1390,13 @@ Pasi të keni pranuar shumat, kthehuni në faqen e metodave të pagesës dhe kli
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Qeqe',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Kontabilitet & Ligjore',
--- a/resources/lang/sv/texts.php
+++ b/resources/lang/sv/texts.php
@ -1391,6 +1391,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/lang/th/texts.php
+++ b/resources/lang/th/texts.php
@ -1392,6 +1392,13 @@ $LANG = array(
    'payment_type_PayPal' => 'PayPal',
    'payment_type_Google Wallet' => 'Google Wallet',
    'payment_type_Check' => 'Check',
+    'payment_type_Carte Blanche' => 'Carte Blanche',
+    'payment_type_UnionPay' => 'UnionPay',
+    'payment_type_JCB' => 'JCB',
+    'payment_type_Laser' => 'Laser',
+    'payment_type_Maestro' => 'Maestro',
+    'payment_type_Solo' => 'Solo',
+    'payment_type_Switch' => 'Switch',

    // Industries
    'industry_Accounting & Legal' => 'Accounting & Legal',
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@ -134,33 +134,6 @@
        {!! Former::close() !!}

        <p/>
-        <center>
-            <!--
-            <div id="fb-root"></div>
-            <script>(function(d, s, id) {
-                var js, fjs = d.getElementsByTagName(s)[0];
-                if (d.getElementById(id)) return;
-                js = d.createElement(s); js.id = id;
-                js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=635126583203143";
-                fjs.parentNode.insertBefore(js, fjs);
-            }(document, 'script', 'facebook-jssdk'));</script>
-
-            <div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>&nbsp;&nbsp;
-
-            <a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" data-related="hillelcoren" data-size="medium">Follow @invoiceninja</a>
-            <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-
-            <iframe src="https://ghbtns.com/github-btn.html?user=hillelcoren&repo=invoice-ninja&type=star&count=false" frameborder="0" scrolling="0" width="50px" height="20px"></iframe>
-            -->
-
-            <p>&nbsp;</p>
-            <p>&nbsp;</p>
-
-            <!--
-            <iframe allowTransparency="true" frameborder="0" scrolling="no" src="https://bitnami.com/product/invoice-ninja/widget" style="border:none;width:230px; height:100px;"></iframe>
-            -->
-
-        </center>

    </div>

--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@ -109,7 +109,6 @@
  function handleSignedUp() {
      localStorage.setItem('guest_key', '');
      fbq('track', 'CompleteRegistration');
-      window._fbq.push(['track', '{{ env('FACEBOOK_PIXEL_SIGN_UP') }}', {'value':'0.00','currency':'USD'}]);
      trackEvent('/account', '/signed_up');
  }

--- a/resources/views/invoices/knockout.blade.php
+++ b/resources/views/invoices/knockout.blade.php
@ -233,6 +233,9 @@ function InvoiceModel(data) {
    }

    self.addItem = function() {
+        if (self.invoice_items().length >= {{ MAX_INVOICE_ITEMS }}) {
+            return false;
+        }
        var itemModel = new ItemModel();
        @if ($account->hide_quantity)
            itemModel.qty(1);
--- a/resources/views/master.blade.php
+++ b/resources/views/master.blade.php
@ -246,11 +246,8 @@

        @if (Session::has('trackEventCategory') && Session::has('trackEventAction'))
            @if (Session::get('trackEventAction') === '/buy_pro_plan')
-                window._fbq.push(['track', '{{ env('FACEBOOK_PIXEL_BUY_PRO') }}', {
-            'value': '{{ session('trackEventAmount') }}',
-            'currency': 'USD'
-        }]);
-        @endif
+                fbq('track', 'Purchase', {value: '{{ session('trackEventAmount') }}', currency: 'USD'});
+            @endif
        @endif

        @if (Session::has('onReady'))
--- a/resources/views/payments/stripe/credit_card.blade.php
+++ b/resources/views/payments/stripe/credit_card.blade.php
@ -75,7 +75,8 @@
                        // and submit
                        $form.get(0).submit();
                    } else {
-                        logError(JSON.stringify(response));
+                        $('#js-error-message').html('An error occurred').fadeIn();
+                        logError('STRIPE_ERROR:' + JSON.stringify(response));
                    }
                }
            };
--- a/resources/views/public/header.blade.php
+++ b/resources/views/public/header.blade.php
@ -10,17 +10,6 @@

@section('body')

-<!--
-<div id="fb-root"></div>
-<script>(function(d, s, id) {
-  var js, fjs = d.getElementsByTagName(s)[0];
-  if (d.getElementById(id)) return;
-  js = d.createElement(s); js.id = id;
-  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=635126583203143";
-  fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));</script>
-->
-
 {!! Form::open(array('url' => 'get_started', 'id' => 'startForm')) !!}
 {!! Form::hidden('guest_key') !!}
 {!! Form::hidden('sign_up', Input::get('sign_up')) !!}
--- a/tests/acceptance/PaymentCest.php
+++ b/tests/acceptance/PaymentCest.php
@ -34,6 +34,7 @@ class PaymentCest
        $I->fillField(['name' => 'notes'], $this->faker->text(80));
        $I->fillField(['name' => 'cost'], $this->faker->numberBetween(11, 20));
        $I->click('Save');
+        $I->wait(1);
        $I->see($productKey);

        // create invoice
@ -42,6 +43,7 @@ class PaymentCest
        $I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
        $I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
        $I->click('Save');
+        $I->wait(1);
        $I->see($clientEmail);

        $I->amOnPage('/payments/create');
@ -53,7 +55,8 @@ class PaymentCest
        $I->fillField(['name' => 'transaction_reference'], $this->faker->text(12));

        $I->click('Save');
-
+        $I->wait(1);
+        
        $I->see('Successfully created payment');
        $I->seeInDatabase('payments', ['amount' => number_format($amount, 2)]);
    }
@ -61,7 +64,7 @@ class PaymentCest
    public function editPayment(AcceptanceTester $I)
    {
        $ref = $this->faker->text(12);
-        
+
        $I->wantTo('edit a payment');
        $I->amOnPage('/payments/1/edit');