Skip to content

Commit

Permalink
PATCH: module clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
sunnysideupdevs committed Nov 23, 2016
1 parent ee4d3ef commit 0fb89b3
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 6 deletions.
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<FilesMatch "\.(php|php3|php4|php5|phtml|inc)$">
Deny from all
</FilesMatch>
9 changes: 9 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
inherit: true
filter:
filter:
paths: ["code/*", "tests/*"]
excluded_paths:
- thirdparty/*
- parsers/*
- docs/*
- images/*
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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.
Empty file added _module_data/_manifest_exclude
Empty file.
3 changes: 1 addition & 2 deletions code/modifiers/PickUpOrDeliveryModifier.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.";
Expand Down

0 comments on commit 0fb89b3

Please sign in to comment.