Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into presteamshop
Browse files Browse the repository at this point in the history
  • Loading branch information
presteamshop committed Apr 4, 2024
2 parents 3bd7b75 + 46c5c5d commit 25943e3
Show file tree
Hide file tree
Showing 17 changed files with 14 additions and 39 deletions.
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:

steps:
- uses: actions/checkout@master
- uses: php-actions/composer@v6

- name: Archive Release
run: |
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
.idea
.DS_Store
/build/.yarn/*
!/build/.yarn/patches
!/build/.yarn/plugins
!/build/.yarn/releases
!/build/.yarn/sdks
!/build/.yarn/versions
config.xml
config_es.xml
config_en.xml
vendor
4 changes: 1 addition & 3 deletions build/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monei-prestashop",
"version": "1.1.4",
"version": "1.1.7",
"main": "index.js",
"repository": "[email protected]:MONEI/MONEI-PrestaShop.git",
"author": "MONEI <[email protected]>",
Expand All @@ -23,8 +23,6 @@
"plugins": {
"@release-it/bumper": {
"out": [
"../config_es.xml",
"../config_gb.xml",
"../monei.php"
]
}
Expand Down
11 changes: 0 additions & 11 deletions config_es.xml

This file was deleted.

13 changes: 0 additions & 13 deletions config_gb.xml

This file was deleted.

4 changes: 2 additions & 2 deletions monei.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function __construct()
$this->description = $this->l('Accept Card, Bizum, PayPal and many more payment methods in your store.');
$this->name = 'monei';
$this->tab = 'payments_gateways';
$this->version = '1.1.4';
$this->version = '1.1.7';
$this->author = 'MONEI';
$this->need_instance = 0;
$this->controllers = [
Expand Down Expand Up @@ -1044,7 +1044,7 @@ private function getPaymentMethods($id_cart, $id_customer)
->setCallToActionText($paymentName)
->setAdditionalInformation($template . $template_tokenize)
->setLogo(
Media::getMediaPath(_PS_MODULE_DIR_ . $this->name . '/views/img/payments/unknown.svg')
Media::getMediaPath(_PS_MODULE_DIR_ . $this->name . '/views/img/payments/cards.svg')
)
->setAction($link_create_payment);
$payment_methods[] = $option;
Expand Down
Binary file removed views/img/.DS_Store
Binary file not shown.
Binary file removed views/img/monei_cards.png
Binary file not shown.
2 changes: 1 addition & 1 deletion views/img/payments/amex.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions views/img/payments/cards.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion views/img/payments/diners.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 25943e3

Please sign in to comment.