diff --git a/.github/version.txt b/.github/version.txt index 21b159dc..a4db534a 100644 --- a/.github/version.txt +++ b/.github/version.txt @@ -1 +1 @@ -2.5.2 \ No newline at end of file +2.5.3 \ No newline at end of file diff --git a/.github/workflows/changelog_update.yml b/.github/workflows/changelog_update.yml index 2a655a03..ff5c1d06 100644 --- a/.github/workflows/changelog_update.yml +++ b/.github/workflows/changelog_update.yml @@ -9,7 +9,7 @@ on: jobs: update-branch-changelog: if: ${{ github.event.head_commit.id != github.event.before && github.event.created != true }} - runs-on: ubuntu-latest + runs-on: blacksmith steps: - name: Checkout Code uses: actions/checkout@v2 diff --git a/.github/workflows/master-changelog_manager.yml b/.github/workflows/master-changelog_manager.yml index 00fb9aaf..4f4224c5 100644 --- a/.github/workflows/master-changelog_manager.yml +++ b/.github/workflows/master-changelog_manager.yml @@ -9,7 +9,7 @@ on: jobs: create-release: if: (contains( github.event.head_commit.message, 'major release') || contains( github.event.head_commit.message,'minor release') || contains( github.event.head_commit.message, 'patch release')) - runs-on: ubuntu-latest + runs-on: blacksmith steps: - name: Checkout Code uses: actions/checkout@v2 diff --git a/.github/workflows/run-migration.yml b/.github/workflows/run-migration.yml new file mode 100644 index 00000000..2e8ec1b8 --- /dev/null +++ b/.github/workflows/run-migration.yml @@ -0,0 +1,16 @@ +name: Run Migration +description: 'Run a repository migration, to apply multi-repo updates' +on: + workflow_dispatch: + inputs: + migration_id: + description: 'teamName/migrationName' + required: true + type: string + +jobs: + run-migration: + uses: helloextend/repo-sitioner/.github/workflows/run-migration.yml@main + with: + migration_id: ${{ inputs.migration_id }} + secrets: inherit \ No newline at end of file diff --git a/Block/Adminhtml/Order/Create/Installation.php b/Block/Adminhtml/Order/Create/Installation.php index e88e6f54..ee846c26 100644 --- a/Block/Adminhtml/Order/Create/Installation.php +++ b/Block/Adminhtml/Order/Create/Installation.php @@ -12,12 +12,32 @@ namespace Extend\Warranty\Block\Adminhtml\Order\Create; use Magento\Backend\Block\Template; -use Magento\Directory\Helper\Data as DirectoryHelper; -use Magento\Framework\Json\Helper\Data as JsonHelper; class Installation extends Template { - public function getCurrentStore(){ - return $this->getRequest()->getPost('store_id'); + /** + * @var \Magento\Backend\Model\Session\Quote + */ + + private $quote; + + public function __construct( + \Magento\Backend\Block\Template\Context $context, + \Magento\Backend\Model\Session\Quote $quote = null, + array $data = [] + ){ + $this->quote = $quote ?? \Magento\Framework\App\ObjectManager::getInstance() + ->get(\Magento\Backend\Model\Session\Quote::class); + parent::__construct($context, $data); + } + + /** + * Get store ID from the admin session quote (current order being created). + * + * @return int|null + */ + public function getCurrentStore() + { + return $this->quote->getStoreId(); } } \ No newline at end of file diff --git a/Model/Api/Request/ProductDataBuilder.php b/Model/Api/Request/ProductDataBuilder.php index d37f62f7..ea2fba92 100644 --- a/Model/Api/Request/ProductDataBuilder.php +++ b/Model/Api/Request/ProductDataBuilder.php @@ -280,6 +280,10 @@ public function calculateSyncProductPrice( } if ($bundlePriceCalc == 0 && $bundleTotalPrice == 0) { + if ($product->getPriceType()==1 && $product->getPrice()>0 ) { + return $product->getPrice(); + } + return 0.01; } diff --git a/changelog.md b/changelog.md index fbce4eb4..bd0787ac 100644 --- a/changelog.md +++ b/changelog.md @@ -1,12 +1,22 @@ # Extend Magento2 Changelog -## version: 2.5.2 +## version: 2.5.3 ### Changelog: --- +**2.5.3** + +Patch Release : Merge pull request #419 from helloextend/PUE_Order_details_parent_order + +PUE orders update the parent order item with warranty orders + + + + + **2.5.2** Patch Release : Merge pull request #418 from helloextend/fix_system_xml diff --git a/etc/config.xml b/etc/config.xml index 4eac79e0..3523d573 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -2,7 +2,7 @@ - 2.5.2 + 2.5.3 0 diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml index 65917228..f6c166a9 100644 --- a/etc/csp_whitelist.xml +++ b/etc/csp_whitelist.xml @@ -24,7 +24,9 @@ https://s3.amazonaws.com - + https://extendcoreoffersprod-offersthemelogobucketeb21afa-1lr7le13dvgtp.s3.amazonaws.com