Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b upgrade/payment_info_attr origin/upgrade/payment_info_attr
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout master git merge --no-ff upgrade/payment_info_attr
Step 4. Push the result of the merge to GitLab
git push origin master
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
The changes were merged into master. The source branch has been removed.
30 | 30 | def self.conekta_webhook(params) |
31 | 31 | payment = params[:data][:object] |
32 | 32 | object = Var.find_charge payment[:id] |
33 | object.update_columns(var_status: payment[:status]) | |
34 | object.update_columns(var_payment_at: Time.zone.now) if object.var_payed? | |
33 | case payment[:payment_method][:object] | |
34 | when "bank_transfer_payment" | |
35 | object.update_columns(var_payment_method: "Transferencia bancaria") | |
|
Added 1 commit:
mentioned in commit bcca69e4
Status changed to merged