gear

matronator · Jan 6, 2024 · 510f6f1 · 510f6f1
1 parent 2196881
commit 510f6f1
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 26 deletions.
diff --git a/app/config/config.local.example.neon b/app/config/config.local.example.neon
@@ -15,6 +15,7 @@ parameters:
     secret: 'secret_key'
     appUrl: 'https://global-collapse.com'
     webhookSecret: 'webhook_secret'
+    devMode: true
   darknetUpdate:
     hash: '2Rc9XqqWXa3ur4iiL5IKox782'
     confirm: 'aRXPKmm1Fgzyy6m4z2LZgii1q'

diff --git a/app/config/config.neon b/app/config/config.neon
@@ -51,8 +51,6 @@ services:
     payment: App\Services\PaymentService(%psp%)
     nette.latteFactory:
         setup:
-            # - addFilter(NULL, 'App\Filter\StaticFilters::common')
-            # - addFilter('imageGenerator', '@App\Filter\ImageFilter')
             - addFilter('fromSnake', 'App\Filter\StaticFilters::fromSnake')
             - addFilter('firstLower', 'App\Filter\StaticFilters::firstLower')
             - addFilter('time', 'App\Filter\StaticFilters::time')

diff --git a/app/model/UserRepository.php b/app/model/UserRepository.php
@@ -123,7 +123,7 @@ public static function getModifiedDuration($time, int $modifier = 100): int
 
     public static function getPremiumDuration($time, int $tier): int
     {
-        return self::getModifiedDuration($time, $tier === 3 ? 50 : ($tier === 2 ? 25 : 100));
+        return self::getModifiedDuration($time, $tier === 3 ? 50 : 0);
     }
 
     public function findAllActions()
@@ -357,6 +357,9 @@ public function addXp(int $id, $xp) {
         }
 
         $player = $this->getUser($id);
+        if ($player->tier > 1) {
+            $xp = (int) floor($xp * ($player->tier === 2 ? 1.25 : 1.5));
+        }
         $xpNow = $player->player_stats->xp;
         $xpMax = $player->player_stats->xp_max;
         $level = $player->player_stats->level;

diff --git a/app/modules/Front/components/Assault/AttackerCard.latte b/app/modules/Front/components/Assault/AttackerCard.latte
@@ -28,6 +28,17 @@
     small => true,
     name => 'attackerHp'
   }
+  <div class="uk-width-expand uk-flex" n:if="$attackerGearStats->armor > 0">
+    {include '../../components/UI/ProgressBar/ProgressBar.latte',
+        min => 0,
+        max => $attackerGearStats->armor,
+        value => $attackerGearStats->armor,
+        type => 'gray',
+        small => true,
+        tooltip => 'Armor',
+        name => 'playerArmor'
+    }
+  </div>
   <div class="split">
     <div class="uk-width-auto">
       <div class="{if $attacker->tier > 1}premium-border tier-{$attacker->tier}{/if}">

diff --git a/app/modules/Front/components/Assault/PlayerCard.latte b/app/modules/Front/components/Assault/PlayerCard.latte
@@ -22,7 +22,19 @@
             value => ($player->player_stats->stamina + $playerGearStats->stamina) * 2,
             type => 'red',
             small => true,
-            name => 'playerHP'
+            name => 'playerHP',
+            class => $playerGearStats->armor > 0 ? 'uk-margin-remove-bottom' : ''
+        }
+    </div>
+    <div class="uk-width-expand uk-flex" n:if="$playerGearStats->armor > 0">
+        {include '../../components/UI/ProgressBar/ProgressBar.latte',
+            min => 0,
+            max => $playerGearStats->armor,
+            value => $playerGearStats->armor,
+            type => 'gray',
+            small => true,
+            tooltip => 'Armor',
+            name => 'playerArmor'
         }
     </div>
     <div class="split">

diff --git a/app/modules/Front/components/Assault/VictimCard.latte b/app/modules/Front/components/Assault/VictimCard.latte
@@ -28,6 +28,17 @@
     small => true,
     name => 'victimHp'
   }
+  <div class="uk-width-expand uk-flex" n:if="$victimGearStats->armor > 0">
+    {include '../../components/UI/ProgressBar/ProgressBar.latte',
+        min => 0,
+        max => $victimGearStats->armor,
+        value => $victimGearStats->armor,
+        type => 'gray',
+        small => true,
+        tooltip => 'Armor',
+        name => 'playerArmor'
+    }
+  </div>
   <div class="split">
     <div class="uk-width-expand uk-margin-right">
       <table class="uk-table uk-table-small uk-table-hover" n:if="!$showStats">

diff --git a/app/modules/Front/components/UI/ProgressBar/ProgressBar.css b/app/modules/Front/components/UI/ProgressBar/ProgressBar.css
@@ -47,6 +47,9 @@
 .progress-bar.red .progress-bar-fill {
   background: var(--c-red);
 }
+.progress-bar.gray .progress-bar-fill {
+  background: var(--c-light-5);
+}
 .progress-bar.yellow .progress-bar-value {
   color: var(--black);
 }
diff --git a/app/modules/Front/presenters/PremiumPresenter.php b/app/modules/Front/presenters/PremiumPresenter.php
@@ -5,6 +5,7 @@
 namespace App\FrontModule\Presenters;
 
 use App\Services\StripeService;
+use Tracy\Debugger;
 use VoteCallback;
 
 final class PremiumPresenter extends GamePresenter
@@ -23,12 +24,13 @@ public function __construct(
     protected function startup()
     {
         parent::startup();
-        $this->redirect('Default:default');
+        // $this->redirect('Default:default');
     }
 
     public function renderDefault()
     {
         $this->template->stripePublicKey = $this->stripeService->publicKey;
+        $this->template->dev = $this->stripeService->devMode;
     }
 
     public function renderManage()
@@ -39,11 +41,18 @@ public function renderManage()
         $this->template->stripePublicKey = $this->stripeService->publicKey;
     }
 
-    public function renderSuccess(string $sessionId = null)
+    public function renderSuccess(string $sessionId = null, ?string $mode = null)
     {
         if (!$sessionId) {
             $this->redirect('default');
         }
+
+        $this->template->mode = $mode;
+    }
+
+    public function renderCancel(?string $mode = null)
+    {
+        $this->template->mode = $mode;
     }
 
     public function handleUpgradeAccount(string $item)

diff --git a/app/modules/Front/presenters/WebhookPresenter.php b/app/modules/Front/presenters/WebhookPresenter.php
@@ -145,6 +145,7 @@ private function checkoutSessionCompleted($event)
             http_response_code(200);
             die;
         }
+        $this->stripeOrdersRepository->saveOrder($session, $event->type);
         if ($session->payment_status === 'paid') {
             if ($session->mode === 'subscription') {
                 $price = Price::retrieve($session->line_items->data[0]->price->id);

diff --git a/app/modules/Front/templates/Premium/cancel.latte b/app/modules/Front/templates/Premium/cancel.latte
@@ -6,7 +6,8 @@
 <div class="uk-container uk-margin-auto">
   <div class="uk-card uk-width-auto uk-card-default uk-card-body">
     <h2 class="uk-card-title">Payment Cancelled</h2>
-    <p>Account not upgraded, because the payment was cancelled. <a n:href="default">Go back.</a></p>
+    <p n:if="$mode === 'subscription'">Account not upgraded, because the payment was cancelled. <a n:href="default">Go back.</a></p>
+    <p n:if="$mode === 'payment'">The payment was cancelled. <a n:href="default">Go back.</a></p>
   </div>
 </div>
 {/block}
diff --git a/app/modules/Front/templates/Premium/default.latte b/app/modules/Front/templates/Premium/default.latte
@@ -58,7 +58,7 @@
         playerTier: $user->tier,
         img: $basePath . '/dist/front/images/premium/survivor.jpg',
         imgAlt: 'Survivor Premium Account',
-        priceId: 'price_1NpXM1JJBQOBYTuQNyUN0T86',
+        priceId: $dev ? 'price_1NpXM1JJBQOBYTuQNyUN0T86' : 'price_1NpXalJJBQOBYTuQitS7mpvM',
       }
     </div>
     <div class="uk-width-1-3@s uk-width-1-1">
@@ -70,7 +70,7 @@
         playerTier: $user->tier,
         img: $basePath . '/dist/front/images/premium/immune.jpg',
         imgAlt: 'Immune Premium Account',
-        priceId: 'price_1NpXMPJJBQOBYTuQ4geLaLqp',
+        priceId: $dev ? 'price_1NpXMPJJBQOBYTuQ4geLaLqp' : 'price_1NpglSJJBQOBYTuQYA000C56',
       }
     </div>
   {else}
@@ -122,59 +122,59 @@
       client-reference-id="{$user->username}"
     ></stripe-pricing-table> *}
   </div>
-  <div class="uk-width-1-4@s uk-width-1-1">
+  <div class="uk-width-1-3@s uk-width-1-1">
     {include '../../components/UI/Premium/BitcoinCard.latte',
       amount: 10,
       price: 5,
-      priceId: 'price_1Nx8jXJJBQOBYTuQD2Dd9kFk',
+      priceId: $dev ? 'price_1Nx8jXJJBQOBYTuQD2Dd9kFk' : 'price_1NqL7bJJBQOBYTuQvVhwLcOj',
       img: $basePath . '/dist/front/images/premium/10btc.jpg',
     }
   </div>
-  <div class="uk-width-1-4@s uk-width-1-1">
+  <div class="uk-width-1-3@s uk-width-1-1">
     {include '../../components/UI/Premium/BitcoinCard.latte',
       amount: 25,
       price: 10,
-      priceId: '',
+      priceId: $dev ? '' : 'price_1NqL8JJJBQOBYTuQh0ZFjANY',
       img: $basePath . '/dist/front/images/premium/25btc.jpg',
     }
   </div>
-  <div class="uk-width-1-4@s uk-width-1-1">
+  {* <div class="uk-width-1-3@s uk-width-1-1">
     {include '../../components/UI/Premium/BitcoinCard.latte',
       amount: 50,
       price: 20,
       priceId: '',
       img: $basePath . '/dist/front/images/premium/50btc.jpg',
     }
-  </div>
-  <div class="uk-width-1-4@s uk-width-1-1">
+  </div> *}
+  <div class="uk-width-1-3@s uk-width-1-1">
     {include '../../components/UI/Premium/BitcoinCard.latte',
       amount: 100,
       price: 40,
-      priceId: '',
+      priceId: $dev ? '' : 'price_1NqL9KJJBQOBYTuQ5E7hRMRR',
       img: $basePath . '/dist/front/images/premium/100btc.jpg',
     }
   </div>
-  <div class="uk-width-1-4@s uk-width-1-1">
+  <div class="uk-width-1-3@s uk-width-1-1">
     {include '../../components/UI/Premium/BitcoinCard.latte',
       amount: 250,
       price: 90,
-      priceId: '',
+      priceId: $dev ? '' : 'price_1NqLAVJJBQOBYTuQ2XOmPbiq',
       img: $basePath . '/dist/front/images/premium/250btc.jpg',
     }
   </div>
-  <div class="uk-width-1-4@s uk-width-1-1">
+  <div class="uk-width-1-3@s uk-width-1-1">
     {include '../../components/UI/Premium/BitcoinCard.latte',
       amount: 500,
       price: 175,
-      priceId: '',
+      priceId: $dev ? '' : 'price_1NqLBDJJBQOBYTuQ2k1qW6jX',
       img: $basePath . '/dist/front/images/premium/500btc.jpg',
     }
   </div>
-  <div class="uk-width-1-4@s uk-width-1-1">
+  <div class="uk-width-1-3@s uk-width-1-1">
     {include '../../components/UI/Premium/BitcoinCard.latte',
       amount: 1000,
       price: 330,
-      priceId: '',
+      priceId: $dev ? '' : 'price_1NqLDFJJBQOBYTuQD2KtlE3T',
       img: $basePath . '/dist/front/images/premium/1000btc.jpg',
     }
   </div>

diff --git a/app/modules/Front/templates/Premium/success.latte b/app/modules/Front/templates/Premium/success.latte
@@ -6,7 +6,8 @@
 <div class="uk-container uk-margin-auto">
   <div class="uk-card uk-width-auto uk-card-default uk-card-body">
     <h2 class="uk-card-title">Payment Successful</h2>
-    <p>Account was upgraded! <a n:href="default">Go back.</a></p>
+    <p n:if="$mode === 'subscription'">Account was upgraded! <a n:href="default">Go back.</a></p>
+    <p n:if="$mode === 'payment'">Bitcoins purchased! <a n:href="default">Go back.</a></p>
   </div>
 </div>
 {/block}
diff --git a/app/services/StripeService.php b/app/services/StripeService.php
@@ -17,6 +17,7 @@ class StripeService
     public string $publicKey;
     public string $webhookSecret;
     private string $secretKey;
+    public bool $devMode;
 
     public string $appUrl;
 
@@ -28,6 +29,7 @@ public function __construct(array $config)
         $this->secretKey = $config['secret'];
         $this->appUrl = $config['appUrl'];
         $this->webhookSecret = $config['webhookSecret'];
+        $this->devMode = $config['devMode'];
 
         Stripe::setApiKey($this->secretKey);
         $this->stripeClient = new StripeClient($this->secretKey);
@@ -83,9 +85,10 @@ public function createCheckoutSession(string $priceId, ActiveRow $user, string $
             'mode' => $mode,
             'metadata' => [
                 'user_id' => $user->id,
+                'mode' => $mode,
             ],
-            'success_url' => $this->appUrl . '/premium/success?sessionId={CHECKOUT_SESSION_ID}',
-            'cancel_url' => $this->appUrl . '/premium/cancel',
+            'success_url' => $this->appUrl . '/premium/success?mode=' . $mode . '&sessionId={CHECKOUT_SESSION_ID}',
+            'cancel_url' => $this->appUrl . '/premium/cancel?mode=' . $mode,
         ]);
 
         if ($mode === 'subscription') {