Merge branch 'master' into bugfix/remove-php-cs-cache

mettle · Sep 25, 2020 · f9101e9 · f9101e9
2 parents 3489cca + 956d41b
commit f9101e9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/resources/views/campaigns/status.blade.php b/resources/views/campaigns/status.blade.php
@@ -21,7 +21,7 @@
             Your campaign is queued and will be sent out soon.
         @else
             <i class="fas fa-cog fa-spin"></i>
-            {{ $campaign->formatCount($campaignStats[$campaign->id]['counts']['sent']) }} out of {{ $campaignStats[$campaign->id]['counts']['total'] }} messages sent.
+            {{ $campaignStats[$campaign->id]['counts']['sent'] }} out of {{ $campaignStats[$campaign->id]['counts']['total'] }} messages sent.
         @endif
     </div>
 </div>

diff --git a/src/Console/Commands/SetupProduction.php b/src/Console/Commands/SetupProduction.php
@@ -287,7 +287,11 @@ protected function getUserParam(string $param): string
             'password' => ['required', 'string', 'min:8', 'max:255'],
         ];
 
-        $value = $this->ask(ucfirst($param));
+        if ($param === 'password') {
+            $value = $this->secret(ucfirst($param));
+        } else {
+            $value = $this->ask(ucfirst($param));
+        }
 
         $validator = Validator::make([$param => $value], [
             $param => $validationRules[$param],

diff --git a/src/Services/Campaigns/CampaignStatisticsService.php b/src/Services/Campaigns/CampaignStatisticsService.php
@@ -59,7 +59,7 @@ protected function get(Collection $campaigns, Workspace $workspace): Collection
                     'total' => $countData[$campaign->id]->total,
                     'open' => $countData[$campaign->id]->opened,
                     'click' => $countData[$campaign->id]->clicked,
-                    'sent' => $campaign->formatCount($countData[$campaign->id]->sent),
+                    'sent' => $countData[$campaign->id]->sent,
                 ],
                 'ratios' => [
                     'open' => $campaign->getActionRatio($countData[$campaign->id]->opened, $countData[$campaign->id]->sent),