Merge pull request jgodson#30 from jgodson/fix-bug-with-dollar-sign-r…

…eplacements

Fix bug with dollar sign replacements

src/components/ChangeLogContent.js

@@ -7,8 +7,9 @@ export default function ChangeLogContent({newVersion} = props) {
       <h3 id="changelog">Change Log</h3>
 
       <ul>
-        <li>Fixed a bug when using a combination of the "Bundle Discount" campaign, "Cart Has Items" Cart Qualifier and "Has Properties" Item Selector</li>
-        <li>Renamed “Cart/Item subtotal” <b>Cart Qualifier</b> to “Cart/Item/Discount subtotal” and re-worded options to be more clear.</li>
+        <li>0.26.1 - Fixed a bug when using a combination of the "Bundle Discount" campaign, "Cart Has Items" Cart Qualifier and "Has Properties" Item Selector</li>
+        <li>0.26.1 - Renamed “Cart/Item subtotal” <b>Cart Qualifier</b> to “Cart/Item/Discount subtotal” and re-worded options to be more clear.</li>
+        <li>0.26.2 - Fixed a bug that would cause $1 in some fields to dissapear when editing the campaign</li>
       </ul>
 
       <div style={{paddingTop: '2rem'}}>

src/helpers.js

@@ -119,6 +119,9 @@
           if (index === 0 && values[index] === "") { continue; }
 
           if (values[index] !== null) {
+            // Replace any $ with $$ so we don't replace $<#> with matches in the regex
+            values[index] = values[index].replace(/\$/g, '$$$');
+
             output = output.replace(/{\w+\??:\w+:[\w\s'.(),]+:?([\w\s|,]+)?}/, values[index]);
           }
         }

src/versions.js

@@ -1,4 +1,4 @@
 export default {
-  currentVersion: "0.26.1",
+  currentVersion: "0.26.2",
   minimumVersion: "0.1.0",
 }