radboy 0.0.410__tar.gz → 0.0.412__tar.gz

{radboy-0.0.410 → radboy-0.0.412}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.410
+Version: 0.0.412
 Summary: A small example package
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

radboy-0.0.412/STDOUT.TXT

@@ -0,0 +1,54 @@
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :"t"
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.411"
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"lsbld"
+#USER INPUT# -> :""
+#USER INPUT# -> :""
+#USER INPUT# -> :"q"
+#USER INPUT# -> :"e"
+#USER INPUT# -> :"0.0.412"

{radboy-0.0.410 → radboy-0.0.412}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "radboy"
-version = "0.0.410"
+version = "0.0.412"
 authors = [
   { name="Carl Hirner III", email="k.j.hirner.wisdom@gmail.com" },
 ]

{radboy-0.0.410 → radboy-0.0.412}/radboy/DB/Prompt.py

@@ -951,17 +951,19 @@ class Prompt(object):
 
                     crv+=(Decimal(i.CRV).quantize(Decimal("0.00"))*total)
                     tax+=(Decimal(i.Tax).quantize(Decimal("0.00"))*total)
-                    if tax == 0 and crv > 0:
-                        tax_crv=(Decimal(i.CRV).quantize(Decimal("0.00"))*total)
-                    else:
-                        tax_crv+=(Decimal(i.Tax).quantize(Decimal("0.00"))*total)+(Decimal(i.CRV).quantize(Decimal("0.00")*total))
+
+                    tax_crv=(crv+tax)
                     master_total_tax+=tax
                     master_total_crv+=crv
                     master_total_tax_crv+=tax_crv
                     #print("#exegen",type(total),type(tax_crv))
                     try:
+                        print((total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv),"s1")
+                        print(Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("00.00")),"s2")
+                        print(tax_crv,"s3")
                         #super_total=(round(round(round(total*i.Price,ROUNDTO)+tax_crv,ROUNDTO)/getSuperTotal(results,location_fields,colormapped)['final total'],ROUNDTO))*100
-                        super_total=(total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv)/Decimal(getSuperTotal(results,location_fields,colormapped)['final total']*100).quantize(Decimal("100.1500"))
+                        super_total=(total*Decimal(i.Price).quantize(Decimal("0.00"))+tax+crv)/Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("00.00"))
+                        super_total=super_total*100
                     except Exception as e:
                         p1=total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv
                         p2=Decimal(getSuperTotal(results,location_fields,colormapped)['final total']).quantize(Decimal("0.00"))
@@ -970,12 +972,14 @@ class Prompt(object):
                         print(p2,"p2")
                         super_total=0
                     #print("#exegen2")
+                    super_total=Decimal(super_total).quantize(Decimal("0.00"))
+                    print(super_total)
                     msg+=f"""{Fore.light_magenta} |-|{Fore.light_green} Total = {Fore.light_sea_green}{total}
 {Fore.light_magenta}Price({Decimal(i.Price).quantize(Decimal("0.00"))}){Fore.medium_violet_red}*{Fore.light_slate_blue}Total({total}):{Decimal(i.Price).quantize(Decimal("0.00"))*total}
 {Fore.grey_70}+CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({round(total,ROUNDTO)}){Fore.slate_blue_1}\n=TotalCRV({crv})+TotalPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+crv})
-{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.00"))}) w/o CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total}){Fore.slate_blue_1}\n=TaxNoCRVTotal({tax})+TotalPrice({round(total*i.Price,ROUNDTO)})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax})
-{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.00"))}) w/ CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total}){Fore.slate_blue_1}\n=TaxCRVTotal({tax_crv})+TotalPrice({round(total*i.Price,ROUNDTO)})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax_crv})
-{Fore.medium_violet_red}PercentOfTotal({super_total}) of Total({getSuperTotal(results,location_fields,colormapped)['final total']})
+{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.00"))}) w/o CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total}){Fore.slate_blue_1}\n=TaxNoCRVTotal({tax})+TotalPrice({total*i.Price})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax})
+{Fore.grey_70}+Tax({Decimal(i.Tax).quantize(Decimal("0.00"))}) w/ CRV({Decimal(i.CRV).quantize(Decimal("0.00"))})*Total({total}){Fore.slate_blue_1}\n=TaxCRVTotal({tax_crv})+TotalPrice({total*i.Price})=NetPrice({total*Decimal(i.Price).quantize(Decimal("0.00"))+tax+crv})
+{Fore.medium_violet_red}PercentOfTotal({super_total}%) of FinalTotal({getSuperTotal(results,location_fields,colormapped)['final total']})
 {'*'*os.get_terminal_size().columns}{Style.reset}"""
                     if bldlse:
                         db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)
@@ -989,8 +993,8 @@ class Prompt(object):
                 
                 msg=f"""{Fore.light_green}Total Product Value:{Fore.slate_blue_1}{master_total}
 {Fore.light_green}Total Product Value w/CRV({master_total_crv}):{Fore.slate_blue_1}{master_total_crv+master_total}
-{Fore.light_green}Total Product Value Taxed w/o CRV({master_total_tax}):{Fore.slate_blue_1}{master_total_tax+master_total}
-{Fore.light_green}Total Product Value Taxed w/ CRV({master_total_tax_crv}):{Fore.slate_blue_1}{actual}
+{Fore.light_green}Total Product Value Taxed({master_total_tax}) w/o CRV({master_total_crv}):{Fore.slate_blue_1}{master_total_tax+master_total}
+{Fore.light_green}Total Product Value Taxed({master_total_tax}) w/ CRV({master_total_crv}):{Fore.slate_blue_1}{actual}
                 {Style.reset}"""
                 if bldlse:
                     db.logInput(msg,user=False,filter_colors=True,maxed_hfl=False,ofile=Prompt.bld_file)

radboy-0.0.412/radboy/__init__.py

@@ -0,0 +1 @@
+VERSION='0.0.412'

{radboy-0.0.410 → radboy-0.0.412}/radboy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: radboy
-Version: 0.0.410
+Version: 0.0.412
 Summary: A small example package
 Author: Carl Joseph Hirner III
 Author-email: Carl Hirner III <k.j.hirner.wisdom@gmail.com>

{radboy-0.0.410 → radboy-0.0.412}/setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup,find_packages
 from datetime import datetime
 from pathlib import Path
-VERSION="0.0.410"
+VERSION="0.0.412"
 long_description=Path('README.md')
 if long_description.exists():
   long_description=long_description.open("r").read()

radboy-0.0.410/STDOUT.TXT

@@ -1,31 +0,0 @@
-#USER INPUT# -> :"t"
-#USER INPUT# -> :"mksl"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"ph"
-#USER INPUT# -> :"use"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"b"
-#USER INPUT# -> :"lsbld"
-#USER INPUT# -> :"n"
-#USER INPUT# -> :""
-#USER INPUT# -> :"842595106596"
-#USER INPUT# -> :"qc"
-#USER INPUT# -> :"set"
-#USER INPUT# -> :"2"
-#USER INPUT# -> :"0"
-#USER INPUT# -> :"2.49"
-#USER INPUT# -> :"y"
-#USER INPUT# -> :""
-#USER INPUT# -> :"lsbld"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"lsbld"
-#USER INPUT# -> :""
-#USER INPUT# -> :""
-#USER INPUT# -> :"q"
-#USER INPUT# -> :"e"
-#USER INPUT# -> :"0.0.410"

radboy-0.0.410/radboy/__init__.py

@@ -1 +0,0 @@
-VERSION='0.0.410'