Merge branch 'master' into development

LICENSE.md

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2019, Wuunder Holding BV
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,19 +1,30 @@
 # Wuunder Prestashop plugin
 
-This plugin is meant to function with __version 1.6.X.X of [Prestashop](https://www.prestashop.com/nl).
-The Wuunder plugin compatible with Prestashop __version 1.7.X.X__ can be found [here](…).
+This plugin is meant to function with __version 1.6.X.X__ and __1.7.X.X__.
 
 ## Hello, we are [Wuunder](https://wearewuunder.com/) ##
 We make shipping any parcel, pallet and document easy, personal and efficient. As a business owner, you can book your shipment using your mobile, tablet or computer. We select the best price and pick up your parcel wherever you want. You and the receiver can both track and trace the shipment. You can also stay in contact with each other via our Wuunder chat. Everything without a contract. Why complicate things?
 
+More info regarding the installation: https://wearewuunder.com/eenvoudig-prestashop-koppelen/
+
+## Before you start ##
+* You need to create a free Wuunder account: https://app.wearewuunder.com and request an API-key to use the module: https://wearewuunder.com/en/contact/ 
+* You can download and install the latest release before you sign-up: https://github.com/wuunder/wuunder-webshopplugin-prestashop/releases/latest
+* With this module you connect your Prestashop store to your Wuunder account.
+
 ## Install ##
-* Download the .zip from this repository.
-* Use FTP to transfer the .zip to the modules folder located inside the installation folder of your prestashop web install and unpack.
+
+* Download a release .zip from this repository. If you are not familiar with composer, download the -composer-installed.zip version.
+* Use FTP to transfer the .zip to the module folder located inside the installation folder of your prestashop web install and unpack.
+
 * Navigate to __Modules and Services__->__Modules and Services__ and scroll down until you find __Wuunder shipping module__.
 * To enable and edit __Wuunder shipping module__ click on install to the right.
 * Fill in the form.
 * Scroll down and click "save", The Wuunder tab had been added to __Shipping__->Wuunder and is ready for use!
 
-## Changelog ##
-Changelog can be found [here](https://github.com/kabisa/wuunder-webshopplugin-prestashop/blob/master/CHANGELOG.md)
+## Support ##
+For technical suport you can reach us at:
+* [email protected]
 
+## Changelog ##
+Changelog can be found [here](CHANGELOG.md)