From 0fb89b37bdb49d4710bf6494ac4bae215458dc34 Mon Sep 17 00:00:00 2001
From: sunnysideup <sunnysideupdevs@gmail.com>
Date: Wed, 23 Nov 2016 16:32:22 +1300
Subject: [PATCH] PATCH: module clean-up

---
 .gitattributes                              |  7 +++++++
 .gitignore                                  | 11 +++++++++++
 .htaccess                                   |  3 +++
 .scrutinizer.yml                            |  9 +++++++++
 .travis.yml                                 |  2 +-
 CONTRIBUTING.md                             | 11 ++++++++---
 _module_data/_manifest_exclude              |  0
 code/modifiers/PickUpOrDeliveryModifier.php |  3 +--
 8 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 .gitattributes
 create mode 100644 .gitignore
 create mode 100644 .htaccess
 create mode 100644 .scrutinizer.yml
 create mode 100644 _module_data/_manifest_exclude

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..faf526f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+tests/ export-ignore
+docs/ export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+.scrutinizer.yml export-ignore
+_module_data
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5195265
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+.sass-cache
+.DS_Store
+npm-debug.log
+/.buildpath
+/.project
+/.settings
+css/GridField_print.css
+admin/thirdparty/chosen/node_modules
+node_modules/
+coverage/
+/**/*.js.map
diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..6b71432
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,3 @@
+<FilesMatch "\.(php|php3|php4|php5|phtml|inc)$">
+	Deny from all
+</FilesMatch>
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 0000000..5ba31b7
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,9 @@
+inherit: true
+filter:
+filter:
+  paths: ["code/*", "tests/*"]
+  excluded_paths:
+    - thirdparty/*
+    - parsers/*
+    - docs/*
+    - images/*
diff --git a/.travis.yml b/.travis.yml
index 708154d..96aef00 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ php:
   - 5.3
 
 env:
-  - DB=MYSQL CORE_RELEASE=3.1
+  - DB=MYSQL CORE_RELEASE=3.4
 
 before_script:
   - composer self-update
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5001914..48d5cbd 100755
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,8 +1,13 @@
 # Contributing to ecommerce delivery
 
-Please read the [generic write up for contributing](https://docs.silverstripe.org/en/4.0/contributing/) on silverstripe.org for some general information.  In practice, we would be stoked with any feedback / help you can provide.
+Please read the
+[generic write up for contributing](https://docs.silverstripe.org/en/4.0/contributing/)
+on silverstripe.org for some general information.  In practice,
+we would be stoked with any feedback / help you can provide.
 
 ## Copyright
 
-By supplying code to this module in any form you agree to assign copyright of that code to Sunny Side Up Limited, on the condition that Sunny Side Up Limited releases that code under a form of open source license.
-
+By supplying code to this module in any form you agree to assign
+copyright of that code to Sunny Side Up Limited, on the condition
+that Sunny Side Up Limited releases that code under a form of open
+source license.
diff --git a/_module_data/_manifest_exclude b/_module_data/_manifest_exclude
new file mode 100644
index 0000000..e69de29
diff --git a/code/modifiers/PickUpOrDeliveryModifier.php b/code/modifiers/PickUpOrDeliveryModifier.php
index a6ecc40..f2470ed 100755
--- a/code/modifiers/PickUpOrDeliveryModifier.php
+++ b/code/modifiers/PickUpOrDeliveryModifier.php
@@ -445,8 +445,7 @@ protected function LiveCalculatedTotal()
             elseif ($maxForZeroRate > 0 && $maxForZeroRate > $subTotalAmount) {
                 self::$_actual_charges =  0;
                 $this->debugMessage .= "<hr />Maximum Order Amount For Zero Rate: ".$obj->FreeShippingUpToThisOrderAmount." is higher than amount ordered: ".self::$_actual_charges;
-            }
-            else {
+            } else {
                 //examine weight brackets
                 if ($weight && $weightBrackets->count()) {
                     $this->debugMessage .= "<hr />there is weight: {$weight}gr.";