mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-07 10:34:30 -04:00
Bug fixes
This commit is contained in:
parent
9fc5a1c947
commit
1f4493f191
@ -16,6 +16,7 @@ use App\Factory\InvoiceInvitationFactory;
|
|||||||
use App\Models\Invoice;
|
use App\Models\Invoice;
|
||||||
use App\Models\InvoiceInvitation;
|
use App\Models\InvoiceInvitation;
|
||||||
use App\Services\AbstractService;
|
use App\Services\AbstractService;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
class CreateInvitations extends AbstractService
|
class CreateInvitations extends AbstractService
|
||||||
{
|
{
|
||||||
|
@ -23,6 +23,8 @@ use App\Models\Invoice;
|
|||||||
use App\Models\Payment;
|
use App\Models\Payment;
|
||||||
use App\Models\PaymentTerm;
|
use App\Models\PaymentTerm;
|
||||||
use App\Models\Product;
|
use App\Models\Product;
|
||||||
|
use App\Models\Vendor;
|
||||||
|
use App\Models\VendorContact;
|
||||||
use App\Models\TaskStatus;
|
use App\Models\TaskStatus;
|
||||||
use App\Models\TaxRate;
|
use App\Models\TaxRate;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
@ -414,6 +416,11 @@ class ImportCompanyTest extends TestCase
|
|||||||
$this->assertEquals(1, ClientContact::count());
|
$this->assertEquals(1, ClientContact::count());
|
||||||
/***************************** Client Contacts *****************************/
|
/***************************** Client Contacts *****************************/
|
||||||
|
|
||||||
|
/* Generic */
|
||||||
|
|
||||||
|
|
||||||
|
/* Generic */
|
||||||
|
|
||||||
//vendors!
|
//vendors!
|
||||||
//projects!
|
//projects!
|
||||||
|
|
||||||
@ -459,6 +466,40 @@ class ImportCompanyTest extends TestCase
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private function genericImport($class, $unset, $transform, $object_property, $match_key)
|
||||||
|
{
|
||||||
|
|
||||||
|
$class::unguard();
|
||||||
|
|
||||||
|
|
||||||
|
foreach($this->backup_json_object->{$object_property} as $obj)
|
||||||
|
{
|
||||||
|
|
||||||
|
$obj_array = (array)$obj;
|
||||||
|
foreach($unset as $un){
|
||||||
|
unset($obj_array[$un]);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach($trans as $key => $value)
|
||||||
|
{
|
||||||
|
$obj_array["{$value}"] = $this->transformId($object_property, $obj->{$value});
|
||||||
|
}
|
||||||
|
|
||||||
|
$new_obj = $class::firstOrNew(
|
||||||
|
[$match_key => $obj->{$match_key}, 'company_id' => $this->company->id],
|
||||||
|
$obj_array,
|
||||||
|
);
|
||||||
|
|
||||||
|
$new_obj->save(['timestamps' => false]);
|
||||||
|
|
||||||
|
$this->ids["{$object_property}"]["{$obj->hashed_id}"] = $new_obj->id;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
$class::reguard();
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private function transformId(string $resource, ?string $old): ?int
|
private function transformId(string $resource, ?string $old): ?int
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user