Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@peter-mw
peter-mw committed Dec 2, 2022
2 parents c90f422 + 6a7e588 commit babf280
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 28 deletions.
8 changes: 4 additions & 4 deletions userfiles/modules/admin/import_export_tool/src/ExportFeedFromDatabase.php
View file
Expand Up @@ -50,25 +50,25 @@ public function start()
$exportData = [];

if ($findExportFeed->export_type == 'products') {
if ($findExportFeed->export_format == 'xlsx' || $findExportFeed->export_format == 'csv' || $findExportFeed->export_format == 'xml') {
if ($findExportFeed->export_format == 'xlsx' || $findExportFeed->export_format == 'xls' || $findExportFeed->export_format == 'csv' || $findExportFeed->export_format == 'xml') {
$exportData = $this->exportProductOneLevelArray();
}
}

if ($findExportFeed->export_type == 'categories') {
if ($findExportFeed->export_format == 'xlsx' || $findExportFeed->export_format == 'csv' || $findExportFeed->export_format == 'xml') {
if ($findExportFeed->export_format == 'xlsx' || $findExportFeed->export_format == 'xls' || $findExportFeed->export_format == 'csv' || $findExportFeed->export_format == 'xml') {
$exportData = $this->exportCategoriesOneLevelArray();
}
}

if ($findExportFeed->export_type == 'posts') {
if ($findExportFeed->export_format == 'xlsx' || $findExportFeed->export_format == 'csv' || $findExportFeed->export_format == 'xml') {
if ($findExportFeed->export_format == 'xlsx' || $findExportFeed->export_format == 'xls' || $findExportFeed->export_format == 'csv' || $findExportFeed->export_format == 'xml') {
$exportData = $this->exportPostsOneLevelArray();
}
}

if ($findExportFeed->export_type == 'pages') {
if ($findExportFeed->export_format == 'xlsx' || $findExportFeed->export_format == 'csv' || $findExportFeed->export_format == 'xml') {
if ($findExportFeed->export_format == 'xlsx' || $findExportFeed->export_format == 'xls' || $findExportFeed->export_format == 'csv' || $findExportFeed->export_format == 'xml') {
$exportData = $this->exportPagesOneLevelArray();
}
}
Expand Down
42 changes: 18 additions & 24 deletions userfiles/modules/admin/import_export_tool/src/tests/ImportExportFeedTest.php
View file
Expand Up @@ -2,6 +2,7 @@
namespace MicroweberPackages\Modules\Admin\ImportExportTool\tests;

use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\DB;
use Livewire\Livewire;
use MicroweberPackages\Content\Models\Content;
use MicroweberPackages\Core\tests\TestCase;
Expand All @@ -15,6 +16,7 @@
use MicroweberPackages\Modules\Admin\ImportExportTool\Models\ImportFeed;
use MicroweberPackages\Page\Models\Page;
use MicroweberPackages\Product\Models\Product;
use MicroweberPackages\Repository\Repositories\AbstractRepository;

class ImportExportFeedTest extends TestCase
{
Expand All @@ -25,9 +27,6 @@ public function testInstall()

public function testImportExportWizard()
{
clearcache();
Content::truncate();

$zip = new \ZipArchive();
$zip->open(__DIR__ . '/simple-data.zip');
$content = $zip->getFromName('mw-export-format-products.xlsx');
Expand Down Expand Up @@ -119,27 +118,22 @@ public function testImportExportWizard()

$exportedProduct = $getExportedProducts[$dryProduct['id']];

// $this->assertSame($exportedProduct['parent_id'], $shopProductId);
$this->assertSame($dryProduct['id'], $exportedProduct['id']);
$this->assertSame($dryProduct['title'], $exportedProduct['title']);
//$this->assertSame($dryProduct['url'], $exportedProduct['url']);
$this->assertSame($dryProduct['content_body'], $exportedProduct['content_body']);
$this->assertSame($dryProduct['content_meta_title'], $exportedProduct['content_meta_title']);
$this->assertSame($dryProduct['content_meta_keywords'], $exportedProduct['content_meta_keywords']);
$this->assertSame($dryProduct['price'], $exportedProduct['price']);
$this->assertSame($dryProduct['special_price'], $exportedProduct['special_price']);
$this->assertSame($dryProduct['qty'], $exportedProduct['qty']);
$this->assertSame($dryProduct['sku'], $exportedProduct['sku']);
$this->assertSame($dryProduct['barcode'], $exportedProduct['barcode']);
$this->assertSame($dryProduct['weight'], $exportedProduct['weight']);
$this->assertSame($dryProduct['weight_type'], $exportedProduct['weight_type']);
//$this->assertSame($dryProduct['free_shipping'], $exportedProduct['free_shipping']);
$this->assertSame($dryProduct['width'], $exportedProduct['width']);
$this->assertSame($dryProduct['height'], $exportedProduct['height']);
$this->assertSame($dryProduct['depth'], $exportedProduct['depth']);
// $this->assertSame($dryProduct['tags'], $exportedProduct['tags']);

// dump($dryProduct);dd($exportedProduct);
$this->assertEquals($dryProduct['id'], $exportedProduct['id']);
$this->assertEquals($dryProduct['title'], $exportedProduct['title']);
$this->assertEquals($dryProduct['content_body'], $exportedProduct['content_body']);
$this->assertEquals($dryProduct['content_meta_title'], $exportedProduct['content_meta_title']);
$this->assertEquals($dryProduct['content_meta_keywords'], $exportedProduct['content_meta_keywords']);
$this->assertEquals($dryProduct['price'], $exportedProduct['price']);
$this->assertEquals($dryProduct['special_price'], $exportedProduct['special_price']);
$this->assertEquals($dryProduct['qty'], $exportedProduct['qty']);
$this->assertEquals($dryProduct['sku'], $exportedProduct['sku']);
$this->assertEquals($dryProduct['barcode'], $exportedProduct['barcode']);
$this->assertEquals($dryProduct['weight'], $exportedProduct['weight']);
$this->assertEquals($dryProduct['weight_type'], $exportedProduct['weight_type']);
$this->assertEquals($dryProduct['width'], $exportedProduct['width']);
$this->assertEquals($dryProduct['height'], $exportedProduct['height']);
$this->assertEquals($dryProduct['depth'], $exportedProduct['depth']);

}

}
Expand Down
Binary file modified userfiles/modules/admin/import_export_tool/src/tests/simple-data.zip
View file
Binary file not shown.

0 comments on commit babf280

Please sign in to comment.