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

This commit is contained in:
Joshua Dwire 2016-09-15 11:40:53 -04:00
commit 0fc2a4d323
37 changed files with 889 additions and 80126 deletions

View File

@ -269,6 +269,10 @@ class InvoiceController extends BaseController
private static function getViewModel($invoice) private static function getViewModel($invoice)
{ {
$recurringHelp = ''; $recurringHelp = '';
$recurringDueDateHelp = '';
$recurringDueDates = [];
if ($invoice->is_recurring) {
foreach (preg_split("/((\r?\n)|(\r\n?))/", trans('texts.recurring_help')) as $line) { foreach (preg_split("/((\r?\n)|(\r\n?))/", trans('texts.recurring_help')) as $line) {
$parts = explode('=>', $line); $parts = explode('=>', $line);
if (count($parts) > 1) { if (count($parts) > 1) {
@ -279,7 +283,6 @@ class InvoiceController extends BaseController
} }
} }
$recurringDueDateHelp = '';
foreach (preg_split("/((\r?\n)|(\r\n?))/", trans('texts.recurring_due_date_help')) as $line) { foreach (preg_split("/((\r?\n)|(\r\n?))/", trans('texts.recurring_due_date_help')) as $line) {
$parts = explode('=>', $line); $parts = explode('=>', $line);
if (count($parts) > 1) { if (count($parts) > 1) {
@ -326,6 +329,7 @@ class InvoiceController extends BaseController
$recurringDueDates[$str] = ['value' => "1998-02-$dayStr", 'data-num' => $day, 'class' => 'weekly']; $recurringDueDates[$str] = ['value' => "1998-02-$dayStr", 'data-num' => $day, 'class' => 'weekly'];
} }
} }
}
// Tax rate $options // Tax rate $options
$account = Auth::user()->account; $account = Auth::user()->account;

View File

@ -491,6 +491,7 @@ if (!defined('CONTACT_EMAIL')) {
define('MAX_IFRAME_URL_LENGTH', 250); define('MAX_IFRAME_URL_LENGTH', 250);
define('MAX_LOGO_FILE_SIZE', 200); // KB define('MAX_LOGO_FILE_SIZE', 200); // KB
define('MAX_FAILED_LOGINS', 10); 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_DOCUMENT_SIZE', env('MAX_DOCUMENT_SIZE', 10000));// KB
define('MAX_EMAIL_DOCUMENTS_SIZE', env('MAX_EMAIL_DOCUMENTS_SIZE', 10000));// Total 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) define('MAX_ZIP_DOCUMENTS_SIZE', env('MAX_EMAIL_DOCUMENTS_SIZE', 30000));// Total KB (uncompressed)

View File

@ -13,38 +13,42 @@ class CreateGatewayTypes extends Migration
public function up() public function up()
{ {
Schema::dropIfExists('gateway_types'); Schema::dropIfExists('gateway_types');
Schema::create('gateway_types', function($t) Schema::create('gateway_types', function($table)
{ {
$t->increments('id'); $table->increments('id');
$t->string('alias'); $table->string('alias');
$t->string('name'); $table->string('name');
}); });
Schema::dropIfExists('account_gateway_settings'); 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'); $table->unsignedInteger('account_id');
$t->unsignedInteger('user_id'); $table->unsignedInteger('user_id');
$t->unsignedInteger('gateway_type_id')->nullable(); $table->unsignedInteger('gateway_type_id')->nullable();
$t->timestamp('updated_at')->nullable(); $table->timestamp('updated_at')->nullable();
$t->unsignedInteger('min_limit')->nullable(); $table->unsignedInteger('min_limit')->nullable();
$t->unsignedInteger('max_limit')->nullable(); $table->unsignedInteger('max_limit')->nullable();
$t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
$t->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
$t->foreign('gateway_type_id')->references('id')->on('gateway_types')->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(); $table->unsignedInteger('gateway_type_id')->nullable();
$t->foreign('gateway_type_id')->references('id')->on('gateway_types')->onDelete('cascade'); });
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() public function down()
{ {
Schema::table('payment_types', function($t) Schema::table('payment_types', function($table)
{ {
$t->dropForeign('payment_types_gateway_type_id_foreign'); $table->dropForeign('payment_types_gateway_type_id_foreign');
$t->dropColumn('gateway_type_id'); $table->dropColumn('gateway_type_id');
}); });
Schema::dropIfExists('account_gateway_settings'); Schema::dropIfExists('account_gateway_settings');

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

13548
public/css/built.css vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -47,7 +47,7 @@ thead th {
} }
.sidebar-nav li { .sidebar-nav li {
border-bottom:solid 1px #4c4c4c; border-bottom:solid 1px #444444;
} }
.sidebar-nav i.fa { .sidebar-nav i.fa {
@ -67,7 +67,7 @@ thead th {
.sidebar-nav li:hover, .sidebar-nav li:hover,
.sidebar-nav li.active { .sidebar-nav li.active {
background: rgba(255,255,255,0.2); background: rgba(255,255,255,0.1);
} }
.menu-toggle { .menu-toggle {

View File

@ -110,6 +110,10 @@
text-indent:0px text-indent:0px
} }
#left-sidebar-wrapper ul {
min-height: 660px;
}
.sidebar-nav li > a { .sidebar-nav li > a {
display: block; display: block;
text-decoration: none; text-decoration: none;

View File

@ -1392,6 +1392,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1394,6 +1394,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1392,6 +1392,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1392,6 +1392,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Scheck', '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 // Industries
'industry_Accounting & Legal' => 'Buchhaltung & Rechtswesen', 'industry_Accounting & Legal' => 'Buchhaltung & Rechtswesen',

View File

@ -1392,6 +1392,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1386,6 +1386,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1385,6 +1385,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1386,6 +1386,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

File diff suppressed because it is too large Load Diff

View File

@ -1392,6 +1392,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1386,6 +1386,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1392,6 +1392,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1392,6 +1392,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1392,6 +1392,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1383,6 +1383,13 @@ Kom terug naar deze betalingsmethode pagina zodra u de bedragen heeft ontvangen
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1392,6 +1392,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -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_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -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_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Qeqe', '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 // Industries
'industry_Accounting & Legal' => 'Kontabilitet & Ligjore', 'industry_Accounting & Legal' => 'Kontabilitet & Ligjore',

View File

@ -1391,6 +1391,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -1392,6 +1392,13 @@ $LANG = array(
'payment_type_PayPal' => 'PayPal', 'payment_type_PayPal' => 'PayPal',
'payment_type_Google Wallet' => 'Google Wallet', 'payment_type_Google Wallet' => 'Google Wallet',
'payment_type_Check' => 'Check', '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 // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

View File

@ -134,33 +134,6 @@
{!! Former::close() !!} {!! Former::close() !!}
<p/> <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> </div>

View File

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

View File

@ -233,6 +233,9 @@ function InvoiceModel(data) {
} }
self.addItem = function() { self.addItem = function() {
if (self.invoice_items().length >= {{ MAX_INVOICE_ITEMS }}) {
return false;
}
var itemModel = new ItemModel(); var itemModel = new ItemModel();
@if ($account->hide_quantity) @if ($account->hide_quantity)
itemModel.qty(1); itemModel.qty(1);

View File

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

View File

@ -75,7 +75,8 @@
// and submit // and submit
$form.get(0).submit(); $form.get(0).submit();
} else { } else {
logError(JSON.stringify(response)); $('#js-error-message').html('An error occurred').fadeIn();
logError('STRIPE_ERROR:' + JSON.stringify(response));
} }
} }
}; };

View File

@ -10,17 +10,6 @@
@section('body') @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::open(array('url' => 'get_started', 'id' => 'startForm')) !!}
{!! Form::hidden('guest_key') !!} {!! Form::hidden('guest_key') !!}
{!! Form::hidden('sign_up', Input::get('sign_up')) !!} {!! Form::hidden('sign_up', Input::get('sign_up')) !!}

View File

@ -34,6 +34,7 @@ class PaymentCest
$I->fillField(['name' => 'notes'], $this->faker->text(80)); $I->fillField(['name' => 'notes'], $this->faker->text(80));
$I->fillField(['name' => 'cost'], $this->faker->numberBetween(11, 20)); $I->fillField(['name' => 'cost'], $this->faker->numberBetween(11, 20));
$I->click('Save'); $I->click('Save');
$I->wait(1);
$I->see($productKey); $I->see($productKey);
// create invoice // create invoice
@ -42,6 +43,7 @@ class PaymentCest
$I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey); $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('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
$I->click('Save'); $I->click('Save');
$I->wait(1);
$I->see($clientEmail); $I->see($clientEmail);
$I->amOnPage('/payments/create'); $I->amOnPage('/payments/create');
@ -53,6 +55,7 @@ class PaymentCest
$I->fillField(['name' => 'transaction_reference'], $this->faker->text(12)); $I->fillField(['name' => 'transaction_reference'], $this->faker->text(12));
$I->click('Save'); $I->click('Save');
$I->wait(1);
$I->see('Successfully created payment'); $I->see('Successfully created payment');
$I->seeInDatabase('payments', ['amount' => number_format($amount, 2)]); $I->seeInDatabase('payments', ['amount' => number_format($amount, 2)]);