Skip to content

Commit

Permalink
Merge pull request #229 from czqoocavatsim/dev
Browse files Browse the repository at this point in the history
update currency
  • Loading branch information
mufassilyasir authored Oct 1, 2023
2 parents 3bd9c80 + b60f749 commit bfcf0e6
Show file tree
Hide file tree
Showing 4 changed files with 748 additions and 663 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
KEY: ${{ secrets.PASS }}
PORT: 22
source: ./
target: /var/www/czqoprod/
target: /var/www/czqo-web-prod/

- name: Set permissions
uses: appleboy/ssh-action@master
Expand All @@ -29,7 +29,7 @@ jobs:
KEY: ${{ secrets.PASS }}
PORT: 22
script: |
cd /var/www/czqoprod/
cd /var/www/czqo-web-prod/
chown -R mufassil:www-data .
find . -type f -exec chmod 664 {} \;
find . -type d -exec chmod 775 {} \;
Expand Down
2 changes: 1 addition & 1 deletion app/Jobs/ProcessRosterInactivity.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function handle()
}

if ($rosterMember->active) {
if ($rosterMember->currency < 6.0) {
if ($rosterMember->currency < 3.0) {
$discord = new DiscordClient();
$discord_user_id = $rosterMember->user->discord_user_id;
if ($discord_user_id && $rosterMember->user->member_of_czqo){
Expand Down
4 changes: 2 additions & 2 deletions app/Models/Roster/RosterMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ public function meetsActivityRequirement()
return true;
}

//If they are meet activity requirements why send em an email?
if ($this->currency >= 6.0) {
//If they are meeting activity requirements why send em an email?
if ($this->currency >= 3.0) {
return true;
}

Expand Down
Loading

0 comments on commit bfcf0e6

Please sign in to comment.