Changeset 1556990

Timestamp:

12/18/2016 04:14:37 PM (9 years ago)

Author:

fensoft

Message:

Better default design for token buyout

Location:

fenshop/trunk

Files:

• FenShop.php (modified) (5 diffs)
• assets/buy_choice.txt (modified) (1 diff)
• assets/buy_paiement.txt (modified) (1 diff)
• assets/buy_pseudo.txt (modified) (1 diff)
• assets/buy_summary.txt (modified) (1 diff)
• assets/buy_validation.txt (modified) (1 diff)

fenshop/trunk/FenShop.php

@@ -158 +158 @@
       }
     }
+    
+    if (preg_match_all("/[{]FenShop:currency[}]/s", $content, $matches)) {
+      foreach ($matches[0] as $id => $match) {
+        $fenshop_info = self::getInfo();
+        $content = str_replace($matches[0][$id], $fenshop_info->devises_text->credits, $content);
+      }
+    }
 
     if (preg_match_all("/<!--[{]FenShop:history_begin:([^:]*):([^:]*)}-->(.*)<!--[{]FenShop:history_end[}]-->/sU", $content, $matches)) {
@@ -313 +320 @@
             foreach ($matches_line as $id_line => $match_line)
               $line = str_replace($matches_line[0][$id], $buyout->gain, $line);
+          if (preg_match_all("/[{]FenShop:buy:cost[}]/s", $line, $matches_line))
+            foreach ($matches_line as $id_line => $match_line)
+              $line = str_replace($matches_line[0][$id], $buyout->cost, $line);
           if (preg_match_all("/[{]FenShop:buy:link[}]/s", $line, $matches_line))
             foreach ($matches_line as $id_line => $match_line)
@@ -347 +357 @@
     }
 
+    if (preg_match_all("/[{]FenShop:buy:cost[}]/", $content, $matches)) {
+      $fenshop_buyoutlist = self::getBuyoutList();
+      foreach ($matches[0] as $id => $match) {
+        $content = str_replace($matches[0][$id], $fenshop_buyoutlist[FenSession::get("id")]->cost, $content);
+      }
+    }
+
+    if (preg_match_all("/[{]FenShop:buy:gain[}]/", $content, $matches)) {
+      $fenshop_buyoutlist = self::getBuyoutList();
+      foreach ($matches[0] as $id => $match) {
+        $content = str_replace($matches[0][$id], $fenshop_buyoutlist[FenSession::get("id")]->gain, $content);
+      }
+    }
+
     if (preg_match_all("/[{]FenShop:buy:description[}]/", $content, $matches)) {
       $fenshop_buyoutlist = self::getBuyoutList();
@@ -393 +417 @@
       foreach ($matches[0] as $id => $match) {
         $fenshop_validate = self::getValidate();
-        if ($fenshop_validate->status == "ok")
+        if ($fenshop_validate->status == "OK" || $fenshop_validate->status == "ok")
           $content = str_replace($matches[0][$id], $matches[1][$id], $content);
         else
@@ -616 +640 @@
                  'vote_validation' => 'Vote: Page de validation'/*,
                  'auth'            => 'Page d\'authentification'*/);
-    if (!$options["auth"]) {
+    if ($options["auth"]) {
       unset($res['buy_pseudo']);
       unset($res['use_pseudo']);

fenshop/trunk/assets/buy_choice.txt

@@ -8 +8 @@
         <span class="dynamic-px-width">
           <div style="font-weight: bold; font-variant: small-caps; text-align: center; font-size: 2em;">{FenShop:buy:gain} tokens</div>
+          <div style="text-align: center; border-top: 1px solid #ddd">{FenShop:buy:cost}</div>
           <div style="padding-top: 20px; text-align: center; border-top: 1px solid #ddd">{FenShop:buy:desc}</div>
           <div style="padding-bottom: 10px; text-align: center;"><img style="height: 32px;" src="{FenShop:buy:icon}"/></div>

fenshop/trunk/assets/buy_paiement.txt

@@ -1 @@
-Bonjour {FenShop:nick}, vous avez {FenShop:tokens} tokens
+<center>
+<img src="https://minotar.net/avatar/{FenShop:nick}/68"><br/>
+{FenShop:nick}<br/>
+{FenShop:tokens} tokens<br/>
+<br/>
+<b>Récapitulatif de votre achat :</b><br/>
+{FenShop:buy:gain} {FenShop:currency} .................... {FenShop:buy:cost} <br/>
+<br/>
+<b>Clique ci-dessous pour payer et valider ton achat :</b><br/>
 {FenShop:buy:payment}
+</center>

fenshop/trunk/assets/buy_pseudo.txt

@@ -1 @@
-<form action="{FenShop:buy:link_buy}" method="post">
-<input type="text" name="FenShop_nick" value="{FenShop:nick}"/>
-<input type="submit" value="Valider">
+<center>
+<b>Bienvenue sur notre boutique.</b><br/>
+Pour commencer, veuillez renseigner votre pseudo ci-dessous.<br/>
+<br/>
+<form action="{FenShop:buy:link_buy}" method="post">
+<input style="width: 20em;" type="text" name="FenShop_nick" value="{FenShop:nick}"/><br/>
+<input style="width: 23em;" type="submit" value="Continuer">
 </form>
+</center>

fenshop/trunk/assets/buy_summary.txt

@@ -1 +1 @@
 Vous êtes connecté en tant que {FenShop:nick}.<br/>
 Vous avez {FenShop:tokens} tokens.<br/>
-Vous allez acheter {FenShop:buy:type} pour {FenShop:buy:gain} tokens.<br/>
+Vous allez acheter {FenShop:buy:type} pour {FenShop:buy:gain} {FenShop:currency}.<br/>
 Description:<br/>
 {FenShop:buy:description}

fenshop/trunk/assets/buy_validation.txt

@@ -1 @@
-{FenShop:buy:validate_ifok}
-Merci ! Achat ok ! Vous avez gagné {FenShop:buy:tokens} tokens !
+<center>
+{FenShop:buy:validate_ifok}
+<b>Achat confirmé.</b><br/>
+Votre achat a bien été confirmé. Vous avez reçu {FenShop:buy:tokens} {FenShop:currency} !
 {FenShop:buy:validate_else}
-Fail !
+Une erreur est survenue!<br/>
+<br/>
+Pour recommencer, veuillez renseigner votre pseudo ci-dessous.
+<br/>
+<form action="{FenShop:buy:link_buy}" method="post">
+<input style="width: 20em;" type="text" name="FenShop_nick" value="{FenShop:nick}"/><br/>
+<input style="width: 23em;" type="submit" value="Continuer">
+</form>
 {FenShop:buy:validate_end}
+</center>