Incorrect Payment Status assigned when "Charge and pay now" option used

While testing at http://folio-snapshot-stable.aws.indexdata.com/, Holly noticed that the Fees/Fines History filters showed both "Paid fully" and "Paid Fully" for "Payment Status" filters (as shown in the attached screen print titled FF-History-Error.JPG). There should only be "Paid Fully." The same thing happens for "Paid partially."

Holly did some testing and discovered that when "Charge and pay now" was selected from the New Fee/Fine page, the "Payment Status" was being set to "Paid fully" or "Paid partially" (see attached image Charge-Manual-FF-Error.JPG), but when "Charge only" was selected and the payment was made later the "Payment Status" was set correctly to "Paid Fully" or "Paid Partially."

Please change "Charge and pay now" to set "Payment Status" to "Paid Fully" or "Paid Partially."

Please let me know if you have any questions. Thanks...