Merge branch 'develop' into release/2.1.0

.editorconfig

@@ -0,0 +1,22 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml,json}]
+indent_size = 2
+
+[{composer, auth}.json]
+indent_size = 2
+
+[db_schema_whitelist.json]
+indent_size = 4
+trim_trailing_whitespace = false

.gitignore

@@ -2,3 +2,7 @@
 /vendor
 .reports
 .DS_Store
+
+src/Resources/app/storefront/dist/
+src/Resources/app/storefront/node_modules
+src/Resources/app/administration/node_modules

README.md

@@ -46,10 +46,19 @@ bin/console plugin:install --activate DotdigitalFlow
 ### Step 3 - Build extension assets
 ```
 bash bin/build-administration.sh
+bash bin/build-storefront.sh
 ```
 
 ## Changelog
 
+### 2.1.0
+
+#### What's new
+- Customers and guests can now sign up for SMS marketing, with consent, at registration and checkout.
+- Customers can manage their subscription and subscribed mobile number in their account.
+- SMS subscribers are pushed to a specific list in Dotdigital via the new V3 API.
+- Mobile numbers are validated client-side before submit.
+
 ### 2.0.1
 
 #### Improvements

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "dotdigital/dotdigital-for-shopware-flowbuilder",
   "description": "Integrate with Dotdigital using Flow Builder actions.",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "type": "shopware-platform-plugin",
   "license": "MIT",
   "authors": [
@@ -11,8 +11,16 @@
   ],
   "minimum-stability": "stable",
   "require": {
-    "shopware/core": "6.5.*",
-    "php": "^8.1"
+    "php": "^8.1",
+    "dotdigital/dotdigital-php": "2.1.0"
+  },
+  "require-dev": {
+    "shopware/core": "^6.5.0.0",
+    "shopware/administration": "^6.5.0.0",
+    "shopware/storefront": "^6.5.0.0",
+    "phpunit/phpunit": "^9.5",
+    "phpstan/phpstan": "^1.9",
+    "dg/bypass-finals": "^1.4"
   },
   "extra": {
     "shopware-plugin-class": "Dotdigital\\Flow\\DotdigitalFlow",
@@ -33,14 +41,10 @@
       "Dotdigital\\Tests\\": "tests/PHPUnit"
     }
   },
-  "require-dev": {
-     "phpunit/phpunit": "^9.5",
-     "phpstan/phpstan": "^1.9",
-     "dg/bypass-finals": "^1.4"
-  },
   "config": {
     "allow-plugins": {
-      "symfony/runtime": true
+      "symfony/runtime": true,
+      "php-http/discovery": true
     }
   }
 }