Adding 2.5% discount

cmmcleod · Dec 18, 2015 · 3c8b1f7 · 3c8b1f7
1 parent 62d9749
commit 3c8b1f7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/app/js/shipyard/module-shipyard.js b/app/js/shipyard/module-shipyard.js
@@ -166,6 +166,7 @@ angular.module('shipyard', ['ngLodash'])
    */
   .constant('Discounts', {
     '0%': 1,
+    '2.5%': 0.975,
     '5%': 0.95,
     '10%': 0.90,
     '15%': 0.85,

diff --git a/data b/data
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coriolis_shipyard",
-  "version": "1.10.0",
+  "version": "1.10.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/cmmcleod/coriolis"

diff --git a/test/fixtures/expected-builds.json b/test/fixtures/expected-builds.json
@@ -45,6 +45,6 @@
     "Attack": "25A5C4A4D6A4A3C1r0s0s0s0s000404-04-4a-5d27-.Iw18aQ==.Aw18aQ=="
   },
   "eagle": {
-    "Figther": "42A3A3A1D2A2A2C0p0p24-40532j.Iw19A===.Aw19A==="
+    "Figther": "42A3A3A1D2A2A2C0p0p24-40532j-.Iw1-EA==.Aw1-EA=="
   }
 }
diff --git a/test/fixtures/valid-detailed-export.json b/test/fixtures/valid-detailed-export.json
@@ -3423,7 +3423,8 @@
           "class": 1,
           "rating": "A",
           "group": "Fuel Scoop"
-        }
+        },
+        null
       ]
     },
     "stats": {