Merge pull request #1193 from GiveToken/develop

Develop Merge to get Gary's Hotfix

affiliates.php

@@ -41,8 +41,8 @@
           recruiters. Do you know recruiters that might benefit from
           our service? Introduce us to them using
           <a href="mailto:affiliate@GoSizzle.io">affiliate@GoSizzle.io</a>
-          and will cut you in on 50% for their first 6 months of service.
-          That's up to $825 per lead! Just email us to get started.
+          and we will cut you in on 10% of their first purchase.
+          That's up to $1,260 per lead! Just email us to get started.
         </p>
       </div>
     </div>

ajax/recruiting_token/save.php

@@ -41,16 +41,29 @@
         $token->save();
 
         // need to make sure token has an id before saving cities
-        foreach ($token->getCities() as $currentCity) {
-            $token->removeCity($currentCity->id);
-        }
         if (isset($_POST['city_id']) && '' != $_POST['city_id']) {
             // Polymer bug: convert the city name into an id
             $city_id = (new City())->getIdFromName($_POST['city_id']);
             if (0 >= (int) $city_id) {
                 throw new Exception('Invalid City');
             }
-            $token->addCity($city_id);
+
+            $cityAlreadyAssociated = false;
+            foreach ($token->getCities() as $currentCity) {
+                if ($currentCity->id != $city_id) {
+                    $token->removeCity($currentCity->id);
+                } else {
+                    $cityAlreadyAssociated = true;
+                }
+            }
+
+            if (!$cityAlreadyAssociated) {
+                $token->addCity($city_id);
+            }
+        } else {
+            foreach ($token->getCities() as $currentCity) {
+                $token->removeCity($currentCity->id);
+            }
         }
 
         $response['status'] = "SUCCESS";