diff --git a/app/Console/Commands/UpdateSiteProposals.php b/app/Console/Commands/UpdateSiteProposals.php index 558a0477b102347d118745188065809e726bfd0a..fcf4cd6d0512e72748523a38ea5b5a1bb509c9c3 100644 --- a/app/Console/Commands/UpdateSiteProposals.php +++ b/app/Console/Commands/UpdateSiteProposals.php @@ -78,7 +78,7 @@ class UpdateSiteProposals extends Command if (basename($filename) != $filename) { $this->error("Skipping MR #$mergeRequest->id '$mergeRequest->title': $filename must be in the root folder"); continue; - } + } if (in_array($filename, $ideas)) { $this->error("Skipping MR #$mergeRequest->id '$mergeRequest->title': duplicated $filename, another MR #$ideas[$filename]->id"); continue; @@ -116,7 +116,7 @@ class UpdateSiteProposals extends Command $prop->{'milestones-percentage'} = $milestones_percentage; $prop->percentage = $proposal->percentage_funded; $prop->amount = $proposal->target_amount; - $prop->{'amount-funded'} = $proposal->amount_received; + $prop->{'amount-funded'} = $proposal->raised_amount; $prop->author = $proposal->author; $prop->date = $proposal->created_at->format('F j, Y'); return $prop; diff --git a/app/Http/Resources/ProjectResource.php b/app/Http/Resources/ProjectResource.php index 25d6734d2d1204fac0007e2fa5a1fcb813b51f6c..5f01022a3f096743d2e323a81442df07622bdd0e 100644 --- a/app/Http/Resources/ProjectResource.php +++ b/app/Http/Resources/ProjectResource.php @@ -17,7 +17,7 @@ class ProjectResource extends JsonResource return [ 'subaddr_index' => $this->subaddr_index, 'status' => $this->status, - 'amount_received' => $this->amount_received, + 'raised_amount' => $this->raised_amount, 'target_amount' => $this->target_amount, 'percentage_funded' => $this->percentage_funded, 'qrcode' => ['base64' => base64_encode($this->qrcode)], diff --git a/app/Project.php b/app/Project.php index f07b7665c60e43cbd84e734cbaf740546a965cee..d5c1e20f3cdbb2e714c6fc5f5a147b7f60ec4d72 100644 --- a/app/Project.php +++ b/app/Project.php @@ -15,7 +15,7 @@ use SimpleSoftwareIO\QrCode\Facades\QrCode; * @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $updated_at * @property-read \Illuminate\Database\Eloquent\Collection|\App\Deposit[] $deposits - * @property-read mixed $amount_received + * @property-read mixed $raised_amount * @property-read string $address_uri * @property-read int $percentage_funded * @property-read int $contributions @@ -51,7 +51,7 @@ class Project extends Model } public function getPercentageFundedAttribute() { - return min(100, round($this->amount_received / $this->target_amount * 100)); + return min(100, round($this->raised_amount / $this->target_amount * 100)); } public function getContributionsAttribute() { diff --git a/gitlab/Connection.php b/gitlab/Connection.php index eaa5045e85222a53c4f9e12f7349e85398cc7352..77b385a7493188f62f4f4d67474284f07789188e 100644 --- a/gitlab/Connection.php +++ b/gitlab/Connection.php @@ -18,14 +18,14 @@ class Connection $url = env('GITLAB_URL') . '/merge_requests?scope=all&per_page=50&state='. $state; - $response = $this->client->request('GET', $url, ['headers' => ['Private-Token' => env('GITLAB_ACCESS_TOKEN')]]); + $response = $this->client->request('GET', $url); return collect(json_decode($response->getBody())); } public function getNewFiles($merge_request_iid) { $url = env('GITLAB_URL') . '/merge_requests/' . $merge_request_iid . '/changes'; - $response = $this->client->request('GET', $url, ['headers' => ['Private-Token' => env('GITLAB_ACCESS_TOKEN')]]); + $response = $this->client->request('GET', $url); $deserialized = collect(json_decode($response->getBody())); $result = []; @@ -39,4 +39,4 @@ class Connection } -} \ No newline at end of file +} diff --git a/resources/views/projects/index.blade.php b/resources/views/projects/index.blade.php index 15b6f09fb04a1029e4d87aa99e9b1e973278e190..4bcd731ea32e689c9d44b98aff9996c96454488d 100644 --- a/resources/views/projects/index.blade.php +++ b/resources/views/projects/index.blade.php @@ -12,9 +12,9 @@