Skip to content

Commit 2c12b06

Browse files
committed
information box changed from 7 days => 14 days
1 parent e50be02 commit 2c12b06

12 files changed

Lines changed: 171 additions & 99 deletions

File tree

CHANGELOG.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!-- START_METADATA
22
---
3-
title: Optimizely Changelog
3+
title: Shopware Changelog
44
sidebar_position: 100
5-
description: All notable changes to the Optimizely plugin will be documented in this file.
5+
description: All notable changes to the Shopware plugin will be documented in this file.
66
pagination_next: null
77
pagination_prev: null
88
---
@@ -13,14 +13,22 @@ END_METADATA -->
1313
All notable changes to this project will be documented in this file.
1414

1515
The version number has three segments: `MAJOR.MINOR.PATCH`
16+
1617
- **MAJOR version:** Increments for significant changes that may not be backward-compatible.
1718
- **MINOR version:** Increments for backward-compatible feature additions.
1819
- **PATCH version:** Increments for backward-compatible bug fixes.
1920

2021
For example:
22+
2123
- Version [1.0.0] indicates the first major release.
2224
- Version [1.1.0] signifies a minor release with added features.
2325
- Version [1.1.1] is a patch release with bug fixes.
2426

27+
28+
## [1.0.1]
29+
30+
Information box about reservation is changed from 7 => 14 days
31+
2532
## [1.0.0]
26-
Initial release.
33+
34+
Initial release.

README.md

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,12 @@ sidebar_position: 1
55
description: Provide Vipps and MobilePay payments for Shopware.
66
pagination_next: null
77
pagination_prev: null
8-
draft: true
98
---
109
END_METADATA -->
1110

1211
# Vipps/MobilePay plugin for Shopware
1312

14-
![Support and development by Wexo ](./docs/images/wexo.svg#gh-light-mode-only)![Support and development by Wexo](./docs/images/wexo_dark.svg#gh-dark-mode-only)
15-
16-
![Vipps](./docs/images/vipps.png) *Available for Vipps.*
17-
18-
![MobilePay](./docs/images/mp.png) *Available for MobilePay.*
19-
13+
![Support and development by WEXO ](./docs/images/wexo.svg#gh-light-mode-only)![Support and development by WEXO](./docs/images/wexo_dark.svg#gh-dark-mode-only)
2014

2115
*This plugin is built and maintained by [WEXO](https://www.wexo.dk/) and is hosted on [GitHub](https://github.com/vippsas/shopware-plugin).*
2216

@@ -28,11 +22,13 @@ END_METADATA -->
2822

2923
*Branded locally as MobilePay in Denmark and Finland, and as Vipps in Norway. One platform gathering more than 11 million users and more than 400,000 merchants across the Nordics. Give your users an easy, fast and familiar shopping experience.*
3024

31-
## Table of content
25+
<!-- START_COMMENT -->
26+
## Table of contents
27+
3228
- [Description](#description)
3329
- [Single Payments](#single-payments)
3430
- [How to get started](#how-to-get-started)
35-
- [Installation](#Installation)
31+
- [Installation](#installation)
3632
- [How to get account keys from the merchant portal](#how-to-get-account-keys-from-merchant-portal)
3733
- [In which countries can I use Vipps MobilePay?](#in-which-countries-can-i-use-vipps-mobilepay)
3834
- [In which countries can I use MobilePay?](#in-which-countries-can-i-use-mobilepay)
@@ -44,8 +40,11 @@ END_METADATA -->
4440
- [General documentation](#general-documentation)
4541
- [Plugin documentation](#plugin-documentation)
4642
- [Changelog](#changelog)
43+
<!-- END_COMMENT -->
44+
4745
## Description
48-
🌟 Integrated Vipps and MobilePay: With the ePayments plugin, you can seamlessly offer Vipps and MobilePay as payment options, making transactions smoother for your customers.
46+
47+
🌟 Integrated Vipps and MobilePay: With the Payment plugin, you can seamlessly offer Vipps and MobilePay as payment options, making transactions smoother for your customers.
4948

5049
📱 Automatic Phone Number Transfer: No more manual entries. When customers provide their phone numbers, they're smoothly transferred to their Vipps or MobilePay app, streamlining the checkout process.
5150

@@ -68,6 +67,7 @@ When you enable this plugin, your customers will be able to choose Vipps or Mobi
6867
For more details, see [Applying for services](https://developer.vippsmobilepay.com/docs/knowledge-base/applying-for-services/).
6968

7069
## Installation
70+
7171
- [Installation](./docs/configure.md)
7272

7373
## How to get account keys from Merchant Portal
@@ -78,13 +78,17 @@ For more details, see [Applying for services](https://developer.vippsmobilepay.c
7878

7979
See:
8080

81-
* [Logging in to the portal](https://developer.vippsmobilepay.com/docs/developer-resources/portal)
82-
* [How to find the API keys](https://developer.vippsmobilepay.com/docs/developer-resources/portal#how-to-find-the-api-keys)
81+
- [Logging in to the portal](https://developer.vippsmobilepay.com/docs/developer-resources/portal)
82+
- [How to find the API keys](https://developer.vippsmobilepay.com/docs/developer-resources/portal#how-to-find-the-api-keys)
8383

8484
### In which countries can I use Vipps MobilePay?
85+
8586
#### ![Vipps](./docs/images/vipps.png) Vipps
87+
8688
🇳🇴 Norway
89+
8790
#### ![MobilePay](./docs/images/mp.png) MobilePay
91+
8892
🇩🇰 Denmark
8993
🇫🇮 Finland
9094

@@ -96,33 +100,38 @@ You can only get paid by users who have MobilePay. At the moment plugin is only
96100

97101
### For how long is an order reserved?
98102

99-
When a payment is completed with Vipps MobilePay, the money will be reserved, but only transferred to the merchant when the order is set to Complete or the money is captured manually. For MobilePay, this reservation period is 14 days, so you will need to ship and fulfill orders before this; or to make an agreement with the customer to capture the money before this period is over. For Vipps, the period is 180 days. For payments made by credit card in Vipps/MobilePay Checkout, the period can again be as short as 14 days.
103+
When a payment is completed with Vipps MobilePay, the money will be reserved, but only transferred to the merchant when the order is set to *Complete* or the money is captured manually. For MobilePay, this reservation period is 14 days, so you will need to ship and fulfill orders before this; or to make an agreement with the customer to capture the money before this period is over. For Vipps, the period is 180 days. For payments made by credit card in Vipps/MobilePay Checkout, the period can again be as short as 14 days.
100104

101-
If the order only contains virtual and downloadable products, its possible to setup a rule in Shopware where you can change the shipment status to "shipped" witch will capture the authorized amount. See how the Shopware rule builder works [here](https://docs.shopware.com/en/shopware-6-en/settings/rules)
105+
If the order only contains virtual and downloadable products, it's possible to set up a rule in Shopware where you can change the shipment status to *shipped which will capture the authorized amount. See how the Shopware rule builder works on the [Shopware rule builder page](https://docs.shopware.com/en/shopware-6-en/settings/rules)
102106

103107
## How can I get help if I have any issues?
104108

105109
For issues with your Vipps/MobilePay plugin for Shopware installation, [contact WEXO](https://www.wexo.dk/kontakt). For other issues, contact [Vipps MobilePay](https://developer.vippsmobilepay.com/docs/contact/).
106110

107-
108111
### General FAQs
109112

110113
See the
111114
[Knowledge base](https://developer.vippsmobilepay.com/docs/knowledge-base/)
112115
for more help with Vipps MobilePay eCommerce.
113116

114117
## Requirements
118+
115119
- Shopware: ```~6.5.0```
116120

117121
## Documentation
122+
118123
### General documentation
124+
119125
- [GitHub Repository](https://github.com/vippsas/shopware-plugin)
120126
- [Vipps MobilePay Developer Resources](https://developer.vippsmobilepay.com/)
121127
- [Vipps MobilePay ePayment API](https://developer.vippsmobilepay.com/docs/APIs/epayment-api/)
122128
- [Vipps MobilePay Knowledge base](https://developer.vippsmobilepay.com/docs/knowledge-base/)
129+
123130
### Plugin documentation
131+
124132
- [Vipps MobilePay ePayment enhanced logging](./docs/enhanced_logging.md)
125133
- [Vipps MobilePay ePayment adjust payments](./docs/adjust_payments.md)
126134

127135
## Changelog
128-
Read the Changelog [here](CHANGELOG.md)
136+
137+
Read the [Changelog](CHANGELOG.md)

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Shopware 6 module for accepting Vipps MobilePay payments",
44
"type": "shopware-platform-plugin",
55
"license": "proprietary",
6-
"version": "1.0.0",
6+
"version": "1.0.1",
77
"authors": [
88
{
99
"name": "Vipps MobilePay"

docs/adjust_payments.md

Lines changed: 46 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,25 @@
22
---
33
title: Adjust payments
44
sidebar_label: Adjust payments
5-
sidebar_position: 10
5+
sidebar_position: 20
6+
description: How to adjust payments with the Shopware Payments plugin
67
pagination_next: null
78
pagination_prev: null
89
---
910
END_METADATA -->
1011

11-
1212
# Adjust payments
13-
- [Order detail](#order-detail)
14-
- [Vipps MobilePay Status](#vipps-mobilepay-status)
15-
- [Actions](#actions)
16-
- [Delivery Status](#delivery-status)
1713

14+
<!-- START_COMMENT -->
15+
- [Order detail](#order-detail)
16+
- [Vipps MobilePay Status](#vipps-mobilepay-status)
17+
- [Actions](#actions)
18+
- [Delivery Status](#delivery-status)
19+
<!-- END_COMMENT -->
1820

1921
## Order detail
20-
When an order comes in from the creates it with [Vipps MobilePays API](https://developer.vippsmobilepay.com/api/epayment/#tag/QueryPayments/operation/getPayment)
22+
23+
When an order comes in from the creates it with [Vipps MobilePay's API](https://developer.vippsmobilepay.com/api/epayment/#tag/QueryPayments/operation/getPayment)
2124
where we check the state of the payment
2225

2326
| State | Shopware Payment status | Shopware Delivery status | Shopware Order status | Supported |
@@ -29,18 +32,29 @@ where we check the state of the payment
2932
| [TERMINATED](#terminated) | Open | Open | Open ||
3033

3134
### Created
32-
![order created](./images/adjust_payments/plugin_order_example_created.png)
35+
36+
![Order created](./images/adjust_payments/plugin_order_example_created.png)
37+
3338
### Aborted
34-
![order aborted](./images/adjust_payments/plugin_order_example_aborted.png)
39+
40+
![Order aborted](./images/adjust_payments/plugin_order_example_aborted.png)
41+
3542
### Expired
43+
3644
*Not supported*
45+
3746
### Authorized
38-
![order authorized](./images/adjust_payments/plugin_order_example_authorized.png)
47+
48+
![Order authorized](./images/adjust_payments/plugin_order_example_authorized.png)
49+
3950
### Terminated
51+
4052
*Not supported*
4153

4254
## Vipps MobilePay Status
43-
Here is it possible to se the status of an order. It possible to see
55+
56+
Here, it's possible to see the status of an order; as well as the following:
57+
4458
- PSP Reference ID
4559
- Reference ID
4660
- Transaction Status
@@ -50,39 +64,47 @@ Here is it possible to se the status of an order. It possible to see
5064
- Cancelled Amount
5165
- Total Amount
5266

53-
![vipps mobilepay status](./images/adjust_payments/exampel_of_vipps_mobilepay_status.png)
67+
![Vipps MobilePay status](./images/adjust_payments/exampel_of_vipps_mobilepay_status.png)
5468

5569
### Actions
70+
5671
It's possible to perform actions direct from Shopware administration on an order where there is paid with Vipps MobilePay
5772

5873
#### Capture
59-
By default, if you click `Capture` it will capture the full authorized amount. it will change the Payment Status to `Paid`
74+
75+
By default, if you click `Capture`, it will capture the full authorized amount and change the Payment Status to `Paid`.
6076

6177
#### Partial Capture
62-
If you change the amount to capture and click `Capture` it will capture the amount you have put in. The max you can capture is the Authorized amount. It will change the Payment Status to `Partial paid`
78+
79+
If you change the amount to capture and click `Capture`, it will capture the amount you have entered.
80+
The max you can capture is the Authorized amount. It will change the Payment Status to `Partial paid`.
6381

6482
#### Refund
65-
If you want to refund the full amount of the captured amount then just click `Refund` and it will refund the full amount. It will change the Payment Status to `Refunded`
83+
84+
If you want to refund the full amount of the captured amount, then just click `Refund`. It will refund the full amount and change the Payment Status to `Refunded`.
6685

6786
#### Partial Refund
68-
If you want to refund a part of the captured amount then you just change the amount you want to and the click `Refund`. It will change the Payment Status to `Partial refunded`
87+
88+
If you want to refund a part of the captured amount, then you just change the amount you want to and the click `Refund`. It will change the Payment Status to `Partial refunded`
6989

7090
#### Cancel
71-
If you want to cancel an order make sure there is nothing captured or refunded and then you can just click `Cancel`. It will change the Payment status to `Cancelled`
91+
92+
If you want to cancel an order, make sure there is nothing captured or refunded, and then you can just click `Cancel`. It will change the Payment status to `Cancelled`
7293

7394
## Delivery Status
95+
7496
We are listing to Delivery status
7597

7698
### Shipped
77-
When an order change Delivery status to `Shipped` the full amount will be captured
78-
![vipps mobilepay delivery status shipped](./images/adjust_payments/plugin_shipped.png)
79-
![vipps mobilepay delivery vipps mobilepay shipped status](./images/adjust_payments/plugin_shipped_status.png)
8099

81-
### Returned
82-
When an order change Delivery status to `Returned` the full amount will be refunded
83-
![vipps mobilepay delivery status returned](./images/adjust_payments/plugin_returned.png)
84-
![vipps mobilepay delivery vipps mobilepay returned status](./images/adjust_payments/plugin_returned_status.png)
100+
When an order's Delivery status changes to `Shipped`, the full amount will be captured.
85101

102+
![Vipps MobilePay delivery status shipped](./images/adjust_payments/plugin_shipped.png)
103+
![Vipps MobilePay delivery Vipps MobilePay shipped status](./images/adjust_payments/plugin_shipped_status.png)
86104

105+
### Returned
87106

107+
When an order's Delivery status changes to `Returned`, the full amount will be refunded
88108

109+
![Vipps MobilePay delivery status returned](./images/adjust_payments/plugin_returned.png)
110+
![Vipps MobilePay delivery Vipps MobilePay returned status](./images/adjust_payments/plugin_returned_status.png)

0 commit comments

Comments
 (0)