Update to texas

Makefile

@@ -0,0 +1,56 @@
+APP=checkout
+NS=texastribune
+
+DOCKER_ENV_FILE?=env-docker
+LOG_LEVEL?=INFO
+
+interactive: build backing
+	-docker rm -f ${APP}
+	-docker volume rm ${APP}_node_modules-vol
+	-docker volume create --name ${APP}_node_modules-vol
+	docker run \
+		--volume=${APP}_node_modules-vol:/app/node_modules \
+		--volume="$$(pwd):/app" \
+		--rm --interactive --tty \
+		--env-file=${DOCKER_ENV_FILE} \
+		--publish=80:5000 \
+		--link=rabbitmq:rabbitmq \
+		--link=redis:redis \
+		--name=${APP} ${NS}/${APP}:dev bash
+
+down:
+	docker rm -f ${APP} rabbitmq redis
+
+build:
+	docker build -f Dockerfile --tag=${NS}/${APP}:dev .
+
+clean:
+	-docker stop ${APP} && docker rm ${APP}
+	-docker stop redis && docker rm redis
+	-docker stop rabbitmq && docker rm rabbitmq
+
+backing:
+	-docker rm -f rabbitmq redis
+	docker run --detach --name rabbitmq --publish=15672:15672 rabbitmq:management
+	docker run --detach --name redis redis
+
+test: build
+	docker run \
+		--workdir=/app \
+		--rm \
+		--entrypoint=python \
+		texastribune/checkout:dev /usr/local/bin/py.test /app/tests.py --cov=/app
+
+reconcile-email:
+	docker build --tag=sf-py2 -f Dockerfile.py2 .
+	docker run --env-file=${DOCKER_ENV_FILE} --rm --interactive --tty --name=py2 sf-py2
+
+restart:
+	-pkill celery
+	-pkill python
+	C_FORCE_ROOT=True celery -A app.celery worker --without-heartbeat --without-gossip --without-mingle --loglevel=${LOG_LEVEL} &
+	python3 app.py & npm run dev
+
+celery-restart:
+	-pkill celery
+	C_FORCE_ROOT=True celery -A app.celery worker --without-heartbeat --without-gossip --without-mingle --loglevel=${LOG_LEVEL} &

README.md

@@ -32,6 +32,8 @@ Software to collect donations for nonprofits. It integrates with Saleforce, Stri
 Donations
 =========
 
+Software to collect donations for nonprofits. It integrates with Saleforce, Stripe, Amazon Pay, Slack and Sentry.
+
 - Python running Flask
 - supports single and recurring donations
 - easily deployed on Heroku
@@ -49,18 +51,27 @@ You should also install [`pre-commit`](https://pre-commit.com/#install), which w
 
 Requirements
 ------------
+
 Python 3.6+
 See requirements.txt and dev-requirements.txt for specific Python packages and versions.
 
 Environment
 -----------
+
 | Variable                    |                                        Example |
 |-----------------------------|-----------------------------------------------:|
+| `FLASK_SECRET_KEY`          |  b'f;\xeb\x9bT2\xcd\xdb\xe1#z\xfb\xab\xf8(\x03'|
+| `PUBLISHABLE_KEY`           |                                  pk_test_12345 |
+| `SECRET_KEY`                |                                  sk_test_12335 |
+| `LOG_LEVEL`                 |                                          DEBUG |
+| `AUTH0_PORTAL_M2M_CLIENT_ID`|                                         string |
+| `AUTH0_PORTAL_M2M_CLIENT_SECRET`|                                     string |
 | `AUTH0_DOMAIN`              |                                     domain.com |
 | `AUTH0_PORTAL_AUDIENCE`     |                                      foobarbaz |
 | `AUTH0_PORTAL_CLIENT_ID`    |                             stringstringstring |
-| `PUBLISHABLE_KEY`           |                                  pk_test_12345 |
-| `SECRET_KEY`                |                                  sk_test_12335 |
+| `ENABLE_PORTAL`             |                                           True |
+| `PORTAL_API_DOMAIN`         |                          <https://foo.bar/api> |
+| `PORTAL_CAMPAIGN_ID`        |                             stringstringstring |
 | `SALESFORCE_HOST`           |                            test.salesforce.com |
 | `SALESFORCE_CLIENT_ID`      |                                                |
 | `SALESFORCE_CLIENT_SECRET`  |                                                |
@@ -70,37 +81,36 @@ Environment
 | `SALESFORCE_API_VERSION`    |                                          v43.0 |
 | `CELERY_BROKER_URL`         |              amqp://guest:guest@rabbitmq:5672/ |
 | `CELERY_RESULT_BACKEND`     |                           redis://redis:6379/0 |
-| `FLASK_SECRET_KEY`          | b'f;\xeb\x9bT2\xcd\xdb\xe1#z\xfb\xab\xf8(\x03' |
+| `CELERY_ALWAYS_EAGER`       |                                          False |
+| `CELERY_TASK_SERIALIZER`    |                                           json |
 | `ENABLE_SENTRY`             |                                           True |
+| `ENABLE_SENTRY_RELEASE`     |                                           True |
 | `SENTRY_ENVIRONMENT`        |                                           test |
-| `SENTRY_DSN`                |          https://user:pass@sentry/7?timeout=10 |
+| `SENTRY_DSN`                |        <https://user:pass@sentry/7?timeout=10> |
 | `SENTRY_AUTH_TOKEN`         |                                                |
 | `SENTRY_ORG`                |                                       your-org |
 | `SENTRY_PROJECT`            |                                      donations |
-| `ENABLE_SENTRY_RELEASE`     |                                           True |
 | `ENABLE_SLACK`              |                                          False |
 | `SLACK_API_KEY`             |                                                |
 | `SLACK_CHANNEL`             |                                     #donations |
+| `DEFAULT_MAIL_SENDER`       |                                    foo@bar.org |
 | `MAIL_SERVER`               |                                mail.server.com |
 | `MAIL_USERNAME`             |                                                |
 | `MAIL_PASSWORD`             |                                                |
 | `MAIL_PORT`                 |                                             25 |
 | `MAIL_USE_TLS`              |                                           True |
-| `DEFAULT_MAIL_SENDER`       |                                    foo@bar.org |
 | `ACCOUNTING_MAIL_RECIPIENT` |                                    foo@bar.org |
 | `BUSINESS_MEMBER_RECIPIENT` |                                    foo@bar.org |
+| `CIRCLE_FAILURE_RECIPIENT`  |                                    foo@bar.org |
 | `REDIS_URL`                 |                             redis://redis:6379 |
-| `REDIS_TLS_URL`             |                             redis://redis:6379 |
-| `REPORT_URI`                |                                https://foo.bar |
-| `ENABLE_PORTAL`             |                                           True |
-| `PORTAL_API_DOMAIN`         |                            https://foo.bar/api |
-| `PORTAL_CAMPAIGN_ID`        |                             stringstringstring |
+| `REPORT_URI`                |                              <https://foo.bar> |
 | `RECAPTCHA_SECRET_KEY`      |                             stringstringstring |
 | `RECAPTCHA_SITE_KEY`        |                             stringstringstring |
-| `BAD_ACTOR_API_URL`         |                            https://foo.bar.api |
-| `BAD_ACTOR_NOTIFICATION_URL`|                            https://foo.bar.api |
-| `AUTH0_PORTAL_M2M_CLIENT_ID`|                                         string |
-| `AUTH0_PORTAL_M2M_CLIENT_SECRET`|                                     string |
+| `BAD_ACTOR_API_URL`         |                          <https://foo.bar.api> |
+| `BAD_ACTOR_NOTIFICATION_URL`|                          <https://foo.bar.api> |
+| `NEW_RELIC_APP_NAME`|                                         donations-prod |
+| `NEW_RELIC_LICENSE_KEY`|          [auto-generated by Heroku newrelic add-on] |
+| `NEW_RELIC_LOG`|                  [auto-generated by Heroku newrelic add-on] |
 
 Running the Project
 -------------------
@@ -109,20 +119,13 @@ Run `make backing`. This will start RabbitMQ and Redis.
 Run `make`. This will drop you into the Flask app.
 Run `make restart`. You can interact with the app at `localhost:80`. This command will also build CSS and JS in watch mode and allow you to make test transactions.
 
-```
+```sh
 C_FORCE_ROOT=True celery -A app.celery worker --loglevel=INFO &
 celery beat --app app.celery &
 # gunicorn app:app --log-file=- --bind=0.0.0.0:5000 --access-logfile=-
 ```
 
-Front end
--------------------
-The easiest way to develop is by running `make restart`. Other more granular commands:
-
-+ `npm run js:dev`: Build JS and put Webpack in watch mode
-+ `npm run ds-tasks-watch`: Build CSS and icons in watch mode
-+ `npm run dev`: Run above two commands together
-+ `npm run lint`: Run ESLint
+NOTE: If you are a Tribune engineer, you may need to use `local.texastribune.org/donate` in order to sign in to your account or otherwise interact with the account page.
 
 Running tests
 -------------

app.json

@@ -111,6 +111,15 @@
     "MWS_SECRET_KEY": {
       "required": true
     },
+    "NEW_RELIC_APP_NAME": {
+      "required": false
+    },
+    "NEW_RELIC_LICENSE_KEY": {
+      "required": false
+    },
+    "NEW_RELIC_LOG": {
+      "required": false
+    },
     "PAPERTRAIL_API_TOKEN": {
       "required": true
     },

app.py

@@ -78,7 +78,7 @@
     CancelForm,
     FinishForm,
 )
-from npsp import RDO, Account, Affiliation, Contact, Opportunity
+from npsp import RDO, Account, Affiliation, Contact, Opportunity, SalesforceConnection
 from util import (
     clean,
     notify_slack,
@@ -2192,6 +2192,39 @@ def customer_source_updated(event):
     logging.info("card details updated")
 
 
+@celery.task(name="app.payout_paid")
+def payout_paid(event):
+
+    payout_id = event["data"]["object"]["id"]
+    # get the date of the payout
+    payout_date = event["data"]["object"]["arrival_date"]
+    # payout_date = stripe.Payout.retrieve(payout_id).arrival_date
+    payout_date = datetime.utcfromtimestamp(payout_date).strftime("%Y-%m-%d")
+
+    # get all of the charges in the payout
+    txn_list = []
+    txns = stripe.BalanceTransaction.list(payout=payout_id, type="charge", limit=100)
+    for txn in txns.auto_paging_iter():
+        txn_list.append(txn)
+
+    # format those ids for query
+    charge_ids = [t.source for t in txn_list]
+    charge_ids = ", ".join(["'{}'".format(value) for value in charge_ids])
+    query = (
+        f"SELECT Id FROM Opportunity WHERE Stripe_Transaction_ID__c IN ({charge_ids})"
+    )
+    logging.info(query)
+
+    # get the Opportunity Ids that go with those charges
+    sfc = SalesforceConnection()
+    opps_to_update = sfc.query(query)
+    opps_to_update = [o["Id"] for o in opps_to_update]
+
+    # set the payout date on those opportunities
+    response = sfc.update_payout_dates(opps_to_update, payout_date)
+    logging.debug(response)
+
+
 @celery.task(name="app.authorization_notification")
 def authorization_notification(payload):
 
@@ -2326,6 +2359,8 @@ def stripehook():
 
     if event.type == "customer.source.updated":
         customer_source_updated.delay(event)
+    if event.type == "payout.paid":
+        payout_paid.delay(event)
 
     # TODO change this to debug later
     app.logger.info(event)

batch.py

@@ -94,16 +94,40 @@ def charge_cards():
 
     log.it("---Processing charges...")
 
-    log.it(f"Found {len(opportunities)} opportunities available to process.")
+    processing_msg = f"Found {len(opportunities)} opportunities available to process."
+    log.it(processing_msg)
+    send_slack_message(
+        {
+            "channel": "#stripe",
+            "text": processing_msg,
+            "icon_emoji": ":moneybag:",
+        }
+    )
 
     for opportunity in opportunities:
         # texas does not check the payment type here, but we want to
         if not opportunity.stripe_customer_id or opportunity.payment_type != "Stripe":
             continue
         amount = amount_to_charge(opportunity)
+<<<<<<< HEAD
         log.it(
             f"---- Charging ${amount} to {opportunity.stripe_customer_id} ({opportunity.name})"
         )
+=======
+        try:
+            entry_name = opportunity.name
+            # replaces non-ascii characters with "?" - See PR #851
+            encoded_name = entry_name.encode("ascii", "replace")
+            decoded_name = encoded_name.decode("ascii")
+            log.it(
+                f"---- Charging ${amount} to {opportunity.stripe_customer} ({decoded_name})"
+            )
+        except:
+            log.it(
+                f"---- Charging ${amount} to {opportunity.stripe_customer} ({opportunity.name})"
+            )
+            logging.warn(f"Could not encode {opportunity.name}")
+>>>>>>> texas
         try:
             charge(opportunity)
         except ChargeException as e:

charges.py

@@ -233,6 +233,14 @@ def charge(opportunity):
     logging.info(
         f"---- Charging ${amount} to {opportunity.stripe_customer_id} ({opportunity.name})"
     )
+    if opportunity.stage_name != "Pledged": # this is probably an insufficient check for quarantining
+        raise Exception(f"Opportunity {opportunity.id} is not Pledged")
+    if opportunity.quarantined:
+        logging.info("---- Skipping because it's quarantined")
+        raise QuarantinedException(f"Opportunity {opportunity.id} is quarantined")
+
+    opportunity.stage_name = "In Process"
+    opportunity.save()
 
     if opportunity.stage_name == "Pledged":
         opportunity.stage_name = "In Process"
@@ -299,7 +307,7 @@ def charge(opportunity):
 
                 reason = e.user_message
 
-                if isinstance(e, stripe.error.CardError):
+            if isinstance(e, stripe.error.CardError):
                     logging.info(f"The card has been declined")
                     logging.info(f"Decline code: {e.json_body.get('decline_code', '')}")
 
@@ -365,3 +373,33 @@ def charge(opportunity):
 
         opportunity.stage_name = "Closed Won"
         opportunity.save()
+        raise ChargeException(opportunity, reason)
+
+    if card_charge.status != "succeeded":
+        logging.error("Charge failed. Check Stripe logs.")
+        raise ChargeException(opportunity, "charge failed")
+
+    # There's a lot going on here. Up to this point the donor selected an
+    # amount (say $100) and decided if they wanted to pay our processing
+    # fees. We recorded those two bits of information in the opportunity or the
+    # RDO. Now we're actually charging the card so we have new information:
+    # what the actual processing fees. So we we move stuff around. The
+    # original amount the donor selected was stored in the "amount" field of
+    # the opportunity or the RDO. That amount gets moved to "donor selected
+    # amount" on the opportunity. Now the amount field on the opportunity will
+    # represeent the gross amount (the point of this whole thing) and the
+    # amount minus processing fees gets stored on the opportunity field in "net
+    # amount". We didn't know that amount up until the charge took place
+    # because Amex.
+    balance_transaction = stripe.BalanceTransaction.retrieve(
+        card_charge.balance_transaction
+    )
+    opportunity.donor_selected_amount = opportunity.amount
+    opportunity.net_amount = balance_transaction.net / 100
+    opportunity.amount = amount  # gross
+    gross = card_charge.amount / 100
+
+    opportunity.stripe_card = card_charge.source.id
+    opportunity.stripe_transaction_id = card_charge.id
+    opportunity.stage_name = "Closed Won"
+    opportunity.save()

config.py

@@ -51,7 +51,7 @@ def bool_env(val):
     }
 }
 REDIS_URL = os.getenv("REDIS_URL")
-REDIS_TLS_URL = os.getenv("REDIS_URL") # this doesn't work with our Celery yet
+REDIS_BACKEND_HEALTH_CHECK_INTERVAL = 5
 
 ######
 # SMTP