Skip to content

Commit

Permalink
Merge pull request #12 from magmodules/1.3.3
Browse files Browse the repository at this point in the history
1.3.3
  • Loading branch information
Marvin-Magmodules authored Feb 12, 2019
2 parents 9633964 + e03a329 commit 5dbcc6f
Show file tree
Hide file tree
Showing 64 changed files with 70 additions and 67 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license https://www.magmodules.eu/terms.html Single Service License
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license https://www.magmodules.eu/terms.html Single Service License
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Magmodules/Sooqr/Block/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
6 changes: 5 additions & 1 deletion app/code/community/Magmodules/Sooqr/Helper/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license https://www.magmodules.eu/terms.html Single Service License
*/

Expand Down Expand Up @@ -235,6 +235,10 @@ public function getAttributeValue($field, $product, $config, $actions = '', $par
case 'parent_id':
$value = $this->getProductData($parent, $data);
break;
case 'tier_price':
$data['type'] = 'price';
$value = $this->getProductData($productData, $data);
break;
case 'attribute_set_name':
$value = $this->getAttributeSetName($productData);
break;
Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Magmodules/Sooqr/Helper/Selftest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license https://www.magmodules.eu/terms.html Single Service License
*/

Expand Down
2 changes: 1 addition & 1 deletion app/code/community/Magmodules/Sooqr/Helper/Write.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down Expand Up @@ -129,7 +129,6 @@ public function getExludeAttributes()
'page_layout',
'samples_title',
'sku_type',
'tier_price',
'url_key',
'small_image',
'small_image_label',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Magmodules_Sooqr_Model_Adminhtml_System_Config_Source_Category
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Magmodules_Sooqr_Model_Adminhtml_System_Config_Source_Condition
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Magmodules_Sooqr_Model_Adminhtml_System_Config_Source_Images
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/
class Magmodules_Sooqr_Model_Adminhtml_System_Config_Source_Pricemodel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license https://www.magmodules.eu/terms.html Single Service License
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* @category Magmodules
* @package Magmodules_Sooqr
* @author Magmodules <[email protected]>
* @copyright Copyright (c) 2018 (http://www.magmodules.eu)
* @copyright Copyright (c) 2019 (http://www.magmodules.eu)
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

Expand Down
Loading

0 comments on commit 5dbcc6f

Please sign in to comment.