Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for tests

Browse Source
This commit is contained in:
David Bomba 2020-06-26 08:29:24 +10:00
parent f927e08d41
commit 08d196e6c0
16 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/Client/StoreClientRequest.php
View File

@ -85,6 +85,10 @@ class StoreClientRequest extends Request
}
}
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
//is no settings->currency_id is set then lets dive in and find either a group or company currency all the below may be redundant!!
if (!property_exists($settings, 'currency_id') && isset($input['group_settings_id'])) {
$input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']);

4
app/Http/Requests/Client/UpdateClientRequest.php
View File

@ -92,6 +92,10 @@ class UpdateClientRequest extends Request
$input['group_settings_id'] = $this->decodePrimaryKey($input['group_settings_id']);
}
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
if (isset($input['contacts'])) {
foreach ($input['contacts'] as $key => $contact) {
if (array_key_exists('id', $contact) && is_numeric($contact['id'])) {

4
app/Http/Requests/Credit/StoreCreditRequest.php
View File

@ -58,6 +58,10 @@ class StoreCreditRequest extends FormRequest
$input['client_id'] = $this->decodePrimaryKey($input['client_id']);
}
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
if (isset($input['client_contacts'])) {
foreach ($input['client_contacts'] as $key => $contact) {
if (!array_key_exists('send_email', $contact) || !array_key_exists('id', $contact)) {

4
app/Http/Requests/Credit/UpdateCreditRequest.php
View File

@ -58,6 +58,10 @@ class UpdateCreditRequest extends FormRequest
$input['client_id'] = $this->decodePrimaryKey($input['client_id']);
}
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
if (isset($input['invitations'])) {
foreach ($input['invitations'] as $key => $value) {
if (is_numeric($input['invitations'][$key]['id'])) {

4
app/Http/Requests/Payment/StorePaymentRequest.php
View File

@ -46,6 +46,10 @@ class StorePaymentRequest extends Request
$input['client_id'] = $this->decodePrimaryKey($input['client_id']);
}
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
if (isset($input['invoices']) && is_array($input['invoices']) !== false) {
foreach ($input['invoices'] as $key => $value) {
$input['invoices'][$key]['invoice_id'] = $this->decodePrimaryKey($value['invoice_id']);

4
app/Http/Requests/Payment/UpdatePaymentRequest.php
View File

@ -60,6 +60,10 @@ class UpdatePaymentRequest extends Request
{
$input = $this->all();
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
if (isset($input['client_id'])) {
unset($input['client_id']);
}

4
app/Http/Requests/Product/StoreProductRequest.php
View File

@ -56,6 +56,10 @@ class StoreProductRequest extends Request
$input['quantity'] = 1;
}
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
$this->replace($input);
}
}

4
app/Http/Requests/Product/UpdateProductRequest.php
View File

@ -60,6 +60,10 @@ class UpdateProductRequest extends Request
$input['quantity'] = 1;
}
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
$this->replace($input);
}
}

4
app/Http/Requests/Quote/StoreQuoteRequest.php
View File

@ -44,6 +44,10 @@ class StoreQuoteRequest extends Request
$input['client_id'] = $this->decodePrimaryKey($input['client_id']);
}
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
if (isset($input['client_contacts'])) {
foreach ($input['client_contacts'] as $key => $contact) {
if (!array_key_exists('send_email', $contact) || !array_key_exists('id', $contact)) {

4
app/Http/Requests/Quote/UpdateQuoteRequest.php
View File

@ -69,6 +69,10 @@ class UpdateQuoteRequest extends Request
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
}
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
$this->replace($input);
}
}

5
app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
View File

@ -49,6 +49,11 @@ class StoreRecurringInvoiceRequest extends Request
$input['client_id'] = $this->decodePrimaryKey($input['client_id']);
}
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
//$input['line_items'] = json_encode($input['line_items']);
$this->replace($input);

4
app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
View File

@ -45,6 +45,10 @@ class UpdateRecurringInvoiceRequest extends Request
{
$input = $this->all();
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
//$input['line_items'] = json_encode($input['line_items']);
$this->replace($input);

4
app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php
View File

@ -48,6 +48,10 @@ class StoreRecurringQuoteRequest extends Request
$input['client_id'] = $this->decodePrimaryKey($input['client_id']);
}
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
//$input['line_items'] = json_encode($input['line_items']);
$this->replace($input);

6
app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php
View File

@ -45,7 +45,13 @@ class UpdateRecurringQuoteRequest extends Request
{
$input = $this->all();
if (array_key_exists('assigned_user_id', $input) && is_string($input['assigned_user_id'])) {
$input['assigned_user_id'] = $this->decodePrimaryKey($input['assigned_user_id']);
}
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
$this->replace($input);
}
}

1
app/Models/Payment.php
View File

@ -57,6 +57,7 @@ class Payment extends BaseModel
const TYPE_TOKEN = 'token';
protected $fillable = [
'assigned_user_id',
'client_id',
'type_id',
'amount',

4
tests/Feature/RecurringInvoicesCronTest.php
View File

@ -32,11 +32,13 @@ class RecurringInvoicesCronTest extends TestCase
{
parent::setUp();
RecurringInvoice::truncate();
$this->makeTestData();
}
public function testCountCorrectNumberOfRecurringInvoicesDue()
{
{
//spin up 5 valid and 1 invalid recurring invoices
$recurring_invoices = RecurringInvoice::where('next_send_date', '<=', Carbon::now()->addMinutes(30))->get();