-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #211 from OXID-eSales/UNZER-275_Actualize_b-7.0.x_…
…branch Unzer 275 actualize b 7.0.x branch
- Loading branch information
Showing
55 changed files
with
1,912 additions
and
1,042 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| name: Build image for v7 Demoshop | ||
|
|
||
| # This workflow uses actions that are not certified by GitHub. | ||
| # They are provided by a third-party and are governed by | ||
| # separate terms of service, privacy policy, and support | ||
| # documentation. | ||
|
|
||
| on: | ||
| schedule: | ||
| - cron: '16 6 * * *' | ||
| push: | ||
| branches: | ||
| - b-7.0.x | ||
| repository_dispatch: | ||
| types: [docker-build] | ||
|
|
||
| env: | ||
| # Use docker.io for Docker Hub if empty | ||
| REGISTRY: ghcr.io | ||
| # github.repository as <account>/<repo> | ||
| IMAGE_NAME: ${{ github.repository }} | ||
|
|
||
| jobs: | ||
|
|
||
| build: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: read | ||
| packages: write | ||
|
|
||
| steps: | ||
| - name: Checkout repository | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| ref: b-7.0.x | ||
|
|
||
| - name: Checkout dockerfiles | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| repository: OXID-eSales/module-demoshop-images | ||
| token: ${{ secrets.GH_PAT }} # `GH_PAT` is a secret that contains your PAT | ||
| path: dockerfiles | ||
|
|
||
| - name: move dockerfiles to root folder | ||
| run: mv dockerfiles/unzer/* . | ||
|
|
||
| - name: downcase REPO | ||
| run: | | ||
| echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV} | ||
| - name: Set up QEMU | ||
| uses: docker/setup-qemu-action@v3 | ||
|
|
||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v3 | ||
|
|
||
| # Login against a Docker registry except on PR | ||
| # https://github.com/docker/login-action | ||
| - name: Log into registry ${{ env.REGISTRY }} | ||
| if: github.event_name != 'pull_request' | ||
| uses: docker/login-action@v3 | ||
| with: | ||
| registry: ${{ env.REGISTRY }} | ||
| username: ${{ github.actor }} | ||
| password: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| # Extract metadata (tags, labels) for Docker | ||
| # https://github.com/docker/metadata-action | ||
| - name: Extract Docker metadata | ||
| id: meta | ||
| uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 | ||
| with: | ||
| images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} | ||
|
|
||
| # Build and push Docker image with Buildx (don't push on PR) | ||
| # https://github.com/docker/build-push-action | ||
| - name: Build and push Docker image | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| context: . | ||
| file: ./Dockerfile.v7 | ||
| platforms: linux/amd64,linux/arm64 | ||
| push: ${{ github.event_name != 'pull_request' }} | ||
| tags: | | ||
| ${{ env.REGISTRY }}/${{ env.REPO }}:v7 | ||
| secrets: | | ||
| "github_token=${{ secrets.GITHUB_TOKEN }}" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,9 +9,11 @@ | |
| * Metadata version | ||
| */ | ||
|
|
||
| use OxidSolutionCatalysts\Unzer\Model\DiscountList; | ||
| use OxidSolutionCatalysts\Unzer\Controller\Admin\AdminOrderController; | ||
| use OxidSolutionCatalysts\Unzer\Controller\Admin\ModuleConfiguration; | ||
| use OxidSolutionCatalysts\Unzer\Controller\Admin\OrderMain; | ||
| use OxidSolutionCatalysts\Unzer\Controller\Admin\OrderList; | ||
| use OxidSolutionCatalysts\Unzer\Controller\ApplePayCallbackController; | ||
| use OxidSolutionCatalysts\Unzer\Controller\DispatcherController; | ||
| use OxidSolutionCatalysts\Unzer\Controller\InstallmentController; | ||
|
|
@@ -20,7 +22,6 @@ | |
| use OxidSolutionCatalysts\Unzer\Core\Config; | ||
| use OxidSolutionCatalysts\Unzer\Core\ShopControl; | ||
| use OxidSolutionCatalysts\Unzer\Core\ViewConfig; | ||
| use OxidSolutionCatalysts\Unzer\Model\PaymentGateway; | ||
| use OxidSolutionCatalysts\Unzer\Model\Article; | ||
| use OxidSolutionCatalysts\Unzer\Model\Order; | ||
| use OxidSolutionCatalysts\Unzer\Model\Payment; | ||
|
|
@@ -51,22 +52,23 @@ | |
| </ul>', | ||
| ], | ||
| 'thumbnail' => 'logo.svg', | ||
| 'version' => '1.1.0', | ||
| 'version' => '2.0.4-rc.1', | ||
| 'author' => 'OXID eSales AG', | ||
| 'url' => 'https://www.oxid-esales.com', | ||
| 'email' => '[email protected]', | ||
| 'extend' => [ | ||
| \OxidEsales\Eshop\Application\Controller\Admin\ModuleConfiguration::class => ModuleConfiguration::class, | ||
| \OxidEsales\Eshop\Application\Controller\Admin\OrderMain::class => OrderMain::class, | ||
| \OxidEsales\Eshop\Application\Controller\Admin\OrderList::class => OrderList::class, | ||
| \OxidEsales\Eshop\Application\Controller\OrderController::class => OrderController::class, | ||
| \OxidEsales\Eshop\Application\Controller\PaymentController::class => PaymentController::class, | ||
| \OxidEsales\Eshop\Application\Model\Article::class => Article::class, | ||
| \OxidEsales\Eshop\Application\Model\DiscountList::class => DiscountList::class, | ||
| \OxidEsales\Eshop\Application\Model\Order::class => Order::class, | ||
| \OxidEsales\Eshop\Application\Model\Payment::class => Payment::class, | ||
| \OxidEsales\Eshop\Application\Model\PaymentGateway::class => PaymentGateway::class, | ||
| \OxidEsales\Eshop\Core\Config::class => Config::class, | ||
| \OxidEsales\Eshop\Core\ShopControl::class => ShopControl::class, | ||
| \OxidEsales\Eshop\Core\ViewConfig::class => ViewConfig::class, | ||
| \OxidEsales\Eshop\Core\Config::class => Config::class, | ||
| ], | ||
| 'controllers' => [ | ||
| 'unzer_admin_order' => AdminOrderController::class, | ||
|
|
@@ -133,6 +135,11 @@ | |
| 'block' => 'admin_module_config_var', | ||
| 'file' => 'views/smarty/admin/blocks/admin_module_config_var.tpl' | ||
| ], | ||
| [ | ||
| 'template' => 'order_list.tpl', | ||
| 'block' => 'admin_order_list_item', | ||
| 'file' => 'views/admin/blocks/admin_order_list_item.tpl' | ||
| ], | ||
| [ | ||
| 'template' => 'email/plain/order_cust.tpl', | ||
|
|
@@ -226,7 +233,7 @@ | |
| 'group' => 'unzerapplepay', | ||
| 'name' => 'applepay_label', | ||
| 'type' => 'str', | ||
| 'value' => '' | ||
| 'value' => 'default lable please change' | ||
| ], | ||
| [ | ||
| 'group' => 'unzerapplepay', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * Copyright © OXID eSales AG. All rights reserved. | ||
| * See LICENSE file for license details. | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace OxidSolutionCatalysts\Unzer\Migrations; | ||
|
|
||
| use Doctrine\DBAL\Connection; | ||
| use Doctrine\DBAL\Exception; | ||
| use Doctrine\DBAL\Schema\Schema; | ||
| use Doctrine\DBAL\Types\Types; | ||
| use Doctrine\Migrations\AbstractMigration; | ||
| use Psr\Log\LoggerInterface; | ||
|
|
||
| /** | ||
| * Auto-generated Migration: Please modify to your needs! | ||
| */ | ||
| final class Version20231107212500 extends AbstractMigration | ||
| { | ||
| /** @throws Exception */ | ||
| public function __construct(Connection $connection, LoggerInterface $logger) | ||
| { | ||
| parent::__construct($connection, $logger); | ||
|
|
||
| $this->platform->registerDoctrineTypeMapping('enum', 'string'); | ||
| } | ||
|
|
||
| public function getDescription(): string | ||
| { | ||
| return ''; | ||
| } | ||
|
|
||
| public function up(Schema $schema): void | ||
| { | ||
| $this->updateOxOrderTable($schema); | ||
| } | ||
|
|
||
| public function down(Schema $schema): void | ||
| { | ||
| } | ||
|
|
||
| protected function updateOxOrderTable(Schema $schema): void | ||
| { | ||
| $oxorder = $schema->getTable('oxorder'); | ||
| if (!$oxorder->hasColumn('OXUNZERORDERNR')) { | ||
| $oxorder->addColumn('OXUNZERORDERNR', Types::INTEGER, ['columnDefinition' => 'int(11)', 'default' => 0, 'comment' => 'Unzer Order Nr']); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.