merge code

helper/push_sender.php

@@ -66,7 +66,11 @@ class push_sender
 
         $customizedcast->setPredefinedKeyValue("badge", 0);
         $customizedcast->setPredefinedKeyValue("sound", "chime");
-        $customizedcast->setPredefinedKeyValue("production_mode", "false");
+        if(is_publish()) {
+            $customizedcast->setPredefinedKeyValue("production_mode", "true");
+        } else {
+            $customizedcast->setPredefinedKeyValue("production_mode", "false");
+        }
 
         $pre_keys = ['alias','text'];
         foreach ($pushinfo as $key => $value)
@@ -104,8 +108,11 @@ class push_sender
         $customizedcast->setPredefinedKeyValue("alias_type", $this->android_alias_type);
 
         $customizedcast->setPredefinedKeyValue("display_type", 'message');
-        $customizedcast->setPredefinedKeyValue("production_mode", "true");
-
+        if(is_publish()) {
+            $customizedcast->setPredefinedKeyValue("production_mode", "true");
+        } else {
+            $customizedcast->setPredefinedKeyValue("production_mode", "false");
+        }
         $customizedcast->setPredefinedKeyValue("alias", $pushinfo['member_id']);
         $customizedcast->setPredefinedKeyValue("custom", json_encode($pushinfo['custom']));
         return $customizedcast->send();
@@ -119,11 +126,13 @@ class push_sender
         $customizedcast->setPredefinedKeyValue("timestamp", $this->timestamp);
         $customizedcast->setPredefinedKeyValue("alias_type", $this->ios_alias_type);
         $customizedcast->setPredefinedKeyValue("badge", 1);
-        $customizedcast->setPredefinedKeyValue("production_mode", "false");
-
+        if(is_publish()) {
+            $customizedcast->setPredefinedKeyValue("production_mode", "true");
+        } else {
+            $customizedcast->setPredefinedKeyValue("production_mode", "false");
+        }
         $customizedcast->setPredefinedKeyValue("alias", $pushinfo['member_id']);
         $customizedcast->setPredefinedKeyValue("alert", $pushinfo['text']);
-
         $customizedcast->setCustomizedField("custom", json_encode($pushinfo['custom']));
 
         return $customizedcast->send();

mobile/control/member_buy.php

@@ -159,7 +159,6 @@ class member_buyControl extends mbMemberControl
             }
             else
             {
-                $amount = 50;
                 $result = fcode\send_manager::instance()->fetch($amount,$pay_sn);
                 if($result != false)
                 {