Skip to content

Commit

Permalink
Remove Mobilpay
Browse files Browse the repository at this point in the history
Remove all related to Mobilpay code4moldova#19 issue
  • Loading branch information
boombasteek committed Sep 12, 2020
1 parent 3a9ca24 commit ee61e5c
Show file tree
Hide file tree
Showing 46 changed files with 5 additions and 2,303 deletions.
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"python.pythonPath": "C:\\Users\\edenibr\\Python\\python.exe"
}
4 changes: 2 additions & 2 deletions ro_help/hub/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class NGOAdmin(admin.ModelAdmin):
list_per_page = 25
form = NGOForm

list_display = ("name", "contact_name", "county", "city", "accepts_transfer", "accepts_mobilpay", "created")
list_display = ("name", "contact_name", "county", "city", "accepts_transfer", "created")
list_filter = (
"city",
"county",
Expand Down Expand Up @@ -136,7 +136,7 @@ def save_model(self, request, ngo, form, change):
ngo.save()

NGONeed.objects.filter(ngo=ngo, kind=KIND.MONEY).delete()
if ngo.accepts_transfer or ngo.accepts_mobilpay:
if ngo.accepts_transfer:
need, created = NGONeed.objects.get_or_create(
ngo=ngo, title=ngo.name, kind=KIND.MONEY, city=ngo.city, county=ngo.county,
)
Expand Down
13 changes: 0 additions & 13 deletions ro_help/hub/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,11 @@ class Meta:

def clean(self):
cleaned_data = super().clean()
accepts_mobilpay = cleaned_data.get("accepts_mobilpay")
accepts_transfer = cleaned_data.get("accepts_transfer")
donations_description = cleaned_data.get("donations_description")
mobilpay_icc = cleaned_data.get("mobilpay_icc")
mobilpay_public_key = cleaned_data.get("mobilpay_public_key")
mobilpay_private_key = cleaned_data.get("mobilpay_private_key")
cif = cleaned_data.get("cif")
cui = cleaned_data.get("cui")

if accepts_mobilpay:
if not donations_description:
self.add_error("donations_description", _("To accept mobilpay donations this field is required."))
if not mobilpay_icc:
self.add_error("mobilpay_icc", _("To accept mobilpay donations this field is required."))
if not mobilpay_public_key:
self.add_error("mobilpay_public_key", _("To accept mobilpay donations this field is required."))
if not mobilpay_private_key:
self.add_error("mobilpay_private_key", _("To accept mobilpay donations this field is required."))
if accepts_transfer:
if not donations_description:
self.add_error("donations_description", _("To accept money transfer this field is required"))
Expand Down
1 change: 0 additions & 1 deletion ro_help/hub/management/commands/seed.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
FFC_GROUP_NAME,
NGOReportItem,
)
from mobilpay.models import PaymentOrder


fake = Faker()
Expand Down
15 changes: 0 additions & 15 deletions ro_help/hub/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -247,24 +247,9 @@ class NGO(TimeStampedModel):
_("NGO Statute"), max_length=300, null=True, blank=True, storage=PrivateMediaStorageClass()
)

accepts_mobilpay = models.BooleanField(_("Accepts mobilpay"), default=False)
accepts_transfer = models.BooleanField(_("Accepts transfers"), default=False)
donations_description = models.TextField(_("Donations description"), null=True, blank=True)

mobilpay_icc = models.CharField(
_("mobilpay Merchant identifier code"),
max_length=24,
null=True,
blank=True,
help_text=_("XXXX-XXXX-XXXX-XXXX-XXXX"),
)
mobilpay_public_key = models.FileField(
_("Mobilpay Public key"), max_length=300, null=True, blank=True, storage=PrivateMediaStorageClass()
)
mobilpay_private_key = models.FileField(
_("Mobilpay Private key"), max_length=300, null=True, blank=True, storage=PrivateMediaStorageClass()
)

def __str__(self):
return self.name

Expand Down
5 changes: 0 additions & 5 deletions ro_help/hub/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
URGENCY,
)
from hub.forms import NGOHelperForm, NGORegisterRequestForm
from mobilpay.forms import PaymentOrderForm
from mobilpay.models import PaymentOrder


NEEDS_PER_PAGE = 3
Expand Down Expand Up @@ -315,9 +313,6 @@ class NGODonateCreateView(SuccessMessageMixin, InfoContextMixin, CreateView):
form_class = PaymentOrderForm
success_message = _("Thank you for your donation!")

def get_success_url(self):
return reverse("mobilpay:initialize-payment", kwargs={"order": self.object.order_id})

def get_initial(self):
return {"amount": self.request.GET.get("amount", "0")}

Expand Down
115 changes: 0 additions & 115 deletions ro_help/locale/en/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,6 @@ msgstr ""
msgid "Import Cities"
msgstr ""

#: hub/forms.py:38 hub/forms.py:40 hub/forms.py:42 hub/forms.py:44
msgid "To accept mobilpay donations this field is required."
msgstr ""

#: hub/forms.py:47 hub/forms.py:49
msgid "To accept money transfer this field is required"
msgstr ""
Expand Down Expand Up @@ -185,20 +181,6 @@ msgstr ""
msgid "Contact person's name"
msgstr ""

#: hub/models.py:234 hub/models.py:387 hub/models.py:405 hub/models.py:436
#: mobilpay/models.py:25
msgid "Email"
msgstr ""

#: hub/models.py:235 hub/models.py:389 hub/models.py:406 mobilpay/models.py:24
msgid "Phone"
msgstr ""

#: hub/models.py:236 hub/models.py:409 hub/models.py:439
#: hub/templates/ngo/detail.html:122 mobilpay/models.py:26
msgid "Address"
msgstr ""

#: hub/models.py:242
msgid "Logo"
msgstr ""
Expand All @@ -211,10 +193,6 @@ msgstr ""
msgid "NGO Statute"
msgstr ""

#: hub/models.py:250
msgid "Accepts mobilpay"
msgstr ""

#: hub/models.py:251
msgid "Accepts transfers"
msgstr ""
Expand All @@ -223,22 +201,10 @@ msgstr ""
msgid "Donations description"
msgstr ""

#: hub/models.py:255
msgid "mobilpay Merchant identifier code"
msgstr ""

#: hub/models.py:259
msgid "XXXX-XXXX-XXXX-XXXX-XXXX"
msgstr ""

#: hub/models.py:262
msgid "Mobilpay Public key"
msgstr ""

#: hub/models.py:265
msgid "Mobilpay Private key"
msgstr ""

#: hub/models.py:294
msgid "My organizations"
msgstr ""
Expand All @@ -255,10 +221,6 @@ msgstr ""
msgid "Resource tag"
msgstr ""

#: hub/models.py:341 mobilpay/models.py:13
msgid "NGO"
msgstr ""

#: hub/models.py:343 hub/models.py:371 hub/templates/ngo/detail.html:291
msgid "Title"
msgstr ""
Expand Down Expand Up @@ -363,10 +325,6 @@ msgstr ""
msgid "Image should be 500x500px"
msgstr ""

#: hub/models.py:454 mobilpay/models.py:29 mobilpay/models.py:53
msgid "Registered on"
msgstr ""

#: hub/models.py:459
msgid "Votes history"
msgstr ""
Expand Down Expand Up @@ -1898,79 +1856,6 @@ msgstr ""
msgid "Thank you for your donation!"
msgstr ""

#: mobilpay/admin.py:24
msgid "Responses"
msgstr ""

#: mobilpay/models.py:17
msgid "Order ID"
msgstr ""

#: mobilpay/models.py:19
msgid "First name"
msgstr ""

#: mobilpay/models.py:20
msgid "Last name"
msgstr ""

#: mobilpay/models.py:27
msgid "Details"
msgstr ""

#: mobilpay/models.py:28
msgid "Amount"
msgstr ""

#: mobilpay/models.py:36
msgid "Payment Orders"
msgstr ""

#: mobilpay/models.py:37
msgid "Payment Order"
msgstr ""

#: mobilpay/models.py:59
msgid "Payment responses"
msgstr ""

#: mobilpay/models.py:60
msgid "Payment response"
msgstr ""

#: mobilpay/templates/mobilpay/initialize_payment.html:10
msgid "You are being redirected to payment website"
msgstr ""

#: mobilpay/templates/mobilpay/response.html:12
#, python-format
msgid ""
"\n"
" Plata pentru %(ngo)s a fost confirmată! Îți mulțumim "
"pentru sprijinul tău în această perioadă! Orice ajutor ne crește capacitatea "
"de a face bine mai departe.\n"
" "
msgstr ""

#: mobilpay/templates/mobilpay/response.html:17
#, python-format
msgid ""
"\n"
" Plata pentru %(ngo)s este în curs de procesare. Îți "
"mulțumim pentru sprijinul tău în această perioadă! Orice ajutor ne crește "
"capacitatea de a face bine mai departe.\n"
" "
msgstr ""

#: mobilpay/templates/mobilpay/response.html:21
#, python-format
msgid ""
"\n"
" Plata pentru %(ngo)s nu a putut fi confirmată. Te "
"rugăm să încerci din nou. Îți mulțumim pentru sprijin și răbdare.\n"
" "
msgstr ""

#: ro_help/settings/base.py:212
msgid "COVID-19 RO HELP"
msgstr ""
Expand Down
Loading

0 comments on commit ee61e5c

Please sign in to comment.