Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CORE-POS/IS4C
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: flathat/IS4C
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Nov 12, 2015

  1. LOCAL Support preferred_db in laneside plugins

    Most of this, at least in substance, has already been adopted upstream.
    This has not:
    This smallish fix adding $quoted not upstream yet:@@ -915,7 +935,7 @@
    class InstallUtilities
    +    static public function installCheckboxField($name, $label,
    $default_value=0, $storage=self::EITHER_SETTING, $choices=array(0, 1),
    $attributes=array(), $quoted=false)
    And the bit de-quoting nested arrays in Installed Utilities may not
    really be needed, or if it is should probably be recursive.
    flathat committed Nov 12, 2015
    Copy the full SHA
    71d6919 View commit details
  2. Copy the full SHA
    10bb955 View commit details
  3. WEFC_Toronto tenders MarketBucks and ChequeTender

    Market Bucks is an alternate currency.
    ChequeTenderWEFC_Toronto restricts payment by cheque to items
    from certain departments.
    flathat committed Nov 12, 2015
    Copy the full SHA
    3f21b5d View commit details
  4. LOCAL POS picklists with WEFC_Toronto features

    deptlist and tenderlist support a store-blocked option to show the
     code/number as well as the name.
    memlist has store-blocked option to defeat, for some members,
     the popup to pay off AR Balance.
    These could live upstream but may not be wanted there.
    flathat committed Nov 12, 2015
    Copy the full SHA
    c5646a8 View commit details

Commits on Nov 15, 2015

  1. WEFC_Toronto Variou Coop Cred for 1.8

    Some changes needed for CORE 1.8, other various improvements.
    flathat committed Nov 15, 2015
    Copy the full SHA
    80f5d02 View commit details
  2. LOCAL boxMsg2 from 24c746b / CORE #592

    This fix copied from those upstream.
    flathat committed Nov 15, 2015
    Copy the full SHA
    dc8df59 View commit details

Commits on Nov 21, 2015

  1. WEFC_Toronto bootstrap Coop Cred reports

    Also date-ranged links to the Activity report from Member and Events.
    flathat committed Nov 21, 2015
    Copy the full SHA
    effc474 View commit details
  2. WEFC_Toronto bootstrap margins StoreSummary

    The source-of-margin options are generally applicable.
    The report still assumes a two-tax regime that will limit its use
    elsewhere.
    flathat committed Nov 21, 2015
    Copy the full SHA
    4d1a443 View commit details
  3. Local GeneralRangeReport dates

    The fix is already upstream.
    flathat committed Nov 21, 2015
    Copy the full SHA
    d31636c View commit details

Commits on Jan 3, 2016

  1. WEFC_Toronto lane commands list

    Add descriptions of ES ENDOFSHIFT and RP Reprint Receipt.
    flathat committed Jan 3, 2016
    Copy the full SHA
    b386645 View commit details
  2. Local Trap ES ENDOFSHIFT command

    Sample store-specific code to defeat it and
    actual store-specific code to trap and notify and not execute.
    flathat committed Jan 3, 2016
    Copy the full SHA
    0aa8320 View commit details
  3. WEFC_Toronto Help about Item Editor Discount

    Store-specific help about the meaning of Item Editor Discount options.
    flathat committed Jan 3, 2016
    Copy the full SHA
    31d3238 View commit details
  4. Local WIP Gift Cert tender 5-dollar multiples

    Local, store-specific, work-in-progress to limit Gift Certificate
    tender amounts to multiples of 5 dollars.
    flathat committed Jan 3, 2016
    Copy the full SHA
    12110a3 View commit details
  5. Copy the full SHA
    b38eda2 View commit details
  6. WEFC_Toronto Improve ItemSearch plugin

    Store-specific no-upc prefix selection and other format changes.
    flathat committed Jan 3, 2016
    Copy the full SHA
    ca83385 View commit details

Commits on May 6, 2016

  1. Copy the full SHA
    a7131f1 View commit details

Commits on May 19, 2016

  1. Copy the full SHA
    b6c2493 View commit details
  2. Local memlist not show StoreCharge for some

    Not show StoreCharge for in-house accounts.
    flathat committed May 19, 2016
    Copy the full SHA
    a721ad6 View commit details
  3. Local lane-side debug character set

    May be from upstream.
    flathat committed May 19, 2016
    Copy the full SHA
    25e7d11 View commit details
  4. Local Re a namespace problem

    May be just a jigger for a problem that is actually elsewhere.
    May well not belong upstream.
    flathat committed May 19, 2016
    Copy the full SHA
    97e4d2c View commit details
  5. Local SQLManage apostrophes in colnames

    Is probably upstream.
    flathat committed May 19, 2016
    Copy the full SHA
    56eb5c7 View commit details
  6. Local ManufacturerCouponTender WIP

    Not in use 19May2016.
    flathat committed May 19, 2016
    Copy the full SHA
    593be5a View commit details

Commits on Jul 2, 2016

  1. New housecoupon discount type BG / BOGO.

    Scales with more than one free item.
    Discount value can act as a limiter, in $. 0 means no limit
    gohanman authored and flathat committed Jul 2, 2016
    Copy the full SHA
    b51a6c6 View commit details

Commits on Jul 4, 2017

  1. BUGFIXES: Emv Success Page

    Going to VOID screen needs to send a termReset first
    to get the terminal ready
    
    RP command can't use old ajax-callbacks URL
    gohanman committed Jul 4, 2017
    Copy the full SHA
    ae3df6a View commit details

Commits on Jul 17, 2017

  1. Copy the full SHA
    19e4bb6 View commit details

Commits on Sep 5, 2017

  1. Utility: sync/special_mirror

    From sync/special_mirror/README
    A version of ../special/ for copying (mirroring) tables from this
     server on another server.  My use is making realistic test data.
    See ../special/README on how the files in this directory are used.
    Generally, a symlink named for a table, pointing to a special handler
     that uses mysqldump to transfer tables.
    flathat committed Sep 5, 2017
    Copy the full SHA
    8a8afd6 View commit details
  2. suspendedlist show member#

    WEFC_Toronto only.
    flathat committed Sep 5, 2017
    Copy the full SHA
    dc240fb View commit details
  3. Void and WFCFixup re-factored out

    Changes to parse/Void.php and preparse/WFCFixup.php
    that are probably handled differently upstream now.
    flathat committed Sep 5, 2017
    Copy the full SHA
    dd1a972 View commit details
  4. CoopCredTender diagnostic, commented

    Commented but may be useful again.
    flathat committed Sep 5, 2017
    Copy the full SHA
    8a5d07b View commit details

Commits on Sep 6, 2017

  1. Plugin WefcContactPref

    A version of the Member Module Contact Pref that also has a
    dropdown for a choice about receiving email.
    The cron job members.sync.with.CiviCRM.php syncs this with CiviCRM.
    flathat committed Sep 6, 2017
    Copy the full SHA
    1603a86 View commit details
  2. sync.CiviCRM support memEmailOption

    Sync core_op.memEmailOption.opt_in with a CiviCRM Group subscription.
    Updating CiviCRM from CORE works but updating CORE from CiviCRM has
    been coded but not tested and is defeated in the code.
    Related to plugin WefcContactPref.
    flathat committed Sep 6, 2017
    Copy the full SHA
    b3d0381 View commit details
  3. BasicModel from 2.7 for purchasing

    Probably imported from 2.7 to support purchasing and perpetual
    inventory.
    flathat committed Sep 6, 2017
    Copy the full SHA
    61ab207 View commit details
  4. Copy the full SHA
    73ecd16 View commit details
  5. Copy the full SHA
    7b156ca View commit details
  6. Copy the full SHA
    637bbf7 View commit details
  7. Auth clear auth_classes; Help

    Clear may be re: non-admin users not able to get passwd change page.
    fannie/auth/ui/AuthChangePassword.php
    fannie/auth/ui/AuthIndexPage.php
    flathat committed Sep 6, 2017
    Copy the full SHA
    f852bf3 View commit details
  8. Copy the full SHA
    282c87a View commit details
  9. Shrink Editor cost instead of price

    Report Total Retail and Total Cost instead of UnitPrice and Total Price
    fannie/item/shrink/ShrinkEditor.php
    flathat committed Sep 6, 2017
    Copy the full SHA
    9d10086 View commit details
  10. Shrink Menu add link to ShrinkEditor

    fannie/item/shrink/ShrinkIndex.php
    flathat committed Sep 6, 2017
    Copy the full SHA
    1d033ae View commit details
  11. Shrink Tool support store_id

    fannie/item/shrink/ShrinkTool.php
    flathat committed Sep 6, 2017
    Copy the full SHA
    345709c View commit details
  12. Delete WEFC Item Editor modules

    fannie/item/deleteItem_WEFC_Toronto.php
    fannie/item/insertItem_WEFC_Toronto.php
    fannie/item/itemMaint_WEFC_Toronto.php
    fannie/item/prodAllLanes_WEFC_Toronto.php
    fannie/item/prodFunction_WEFC_Toronto.php
    fannie/item/updateItems_WEFC_Toronto.php
    flathat committed Sep 6, 2017
    Copy the full SHA
    494c8d5 View commit details
  13. AdvItemSearch list with Package column

    fannie/item/AdvancedItemSearch.php
    flathat committed Sep 6, 2017
    Copy the full SHA
    09e1dde View commit details
  14. ItemEditor config for lane updates; discount Help

    fannie/item/ItemEditorPage.php
    flathat committed Sep 6, 2017
    Copy the full SHA
    b4f6db0 View commit details
  15. MarginToolFromSearch various apparent bugfixes

    fannie/item/MarginToolFromSearch.php
    flathat committed Sep 6, 2017
    Copy the full SHA
    db66ef7 View commit details
  16. ProductListPage many changes

    fannie/item/ProductListPage.php
    flathat committed Sep 6, 2017
    Copy the full SHA
    cae77f2 View commit details
  17. addShelfTag many changes

    fannie/item/addShelfTag.php
    flathat committed Sep 6, 2017
    Copy the full SHA
    d8e868c View commit details
  18. BaseItemModule dept and subdept

    fannie/item/modules/BaseItemModule.php
    flathat committed Sep 6, 2017
    Copy the full SHA
    8ca9bb6 View commit details
  19. All recent Fannie Co-op Cred

    CoopCred/CoopCredIndexPage.php
    CoopCred/membership/CoopCredJiggerTool.php
    CoopCred/membership/CoopCredMember.php
    CoopCred/models/CCredConfigModel.php
    CoopCred/models/CCredHistoryBackupModel.php
    CoopCred/models/CCredHistoryModel.php
    CoopCred/models/CCredHistorySumModel.php
    CoopCred/models/CCredMembershipsModel.php
    CoopCred/models/CCredProgramsModel.php
    CoopCred/models/vmodels/CCredHistoryTodayModel.php
    CoopCred/models/vmodels/CCredHistoryTodaySumModel.php
    CoopCred/models/vmodels/CCredLiveBalanceModel.php
    CoopCred/models/vmodels/CCredMemCreditBalanceModel.php
    CoopCred/models/vmodels/README
    CoopCred/programs/CoopCredConfigEditor.php
    CoopCred/programs/CoopCredProgramEditor.php
    CoopCred/reports/Activity/ActivityReport.php
    CoopCred/reports/Activity/ActivityReportSimple.php
    CoopCred/reports/Liability/LiabilityReport.php
    CoopCred/reports/ProgramEvents/ProgramEventsReport.php
    CoopCred/tasks/CoopCredUpdateBalanceTask.php
    CoopCred/tasks/README_tasks
    flathat committed Sep 6, 2017
    Copy the full SHA
    1787e5a View commit details

Commits on Sep 7, 2017

  1. ShelfAudit from WEFC 2017 year end

    The changes made for WEFC's end-of-FY inventory.
    The *WEFC_Toronto.php parts should probably be put in their own
    plugin.
    Includes a page-of-barcodes layout for use with the shelftag system.
    admin/labels/pdf_layouts/WEFC_Inventory_Items.php
    plugins2.0/ShelfAudit/SaFinalReportPage.php
    plugins2.0/ShelfAudit/SaHandheldPage.php
    plugins2.0/ShelfAudit/SaOrderingPage.php
    plugins2.0/ShelfAudit/SaScanningPage.php
    plugins2.0/ShelfAudit/SaReportPage.php
    plugins2.0/ShelfAudit/SaUpdatesPage.php
    plugins2.0/ShelfAudit/SaItemList_WEFC_Toronto.php
    plugins2.0/ShelfAudit/SaMenuPage_WEFC_Toronto.php
    plugins2.0/ShelfAudit/SaOrderingPage_WEFC_Toronto.php
    plugins2.0/ShelfAudit/SaReportPage_WEFC_Toronto.php
    plugins2.0/ShelfAudit/SaScanningPage_WEFC_Toronto.php
    flathat committed Sep 7, 2017
    Copy the full SHA
    6718035 View commit details
  2. Various reports last 2 years Sept 2017

    New and modified:
    reports/AR/ArWithDatesReport.php
    reports/AR/index.php
    reports/ChartOfAccounts/ChartOfAccountsReport.php
    reports/DepartmentMovement/DepartmentMovementReport.php
    reports/DepartmentMovement/SmartMovementReport.php
    reports/DepartmentTop10/DepartmentTop10Report.php
    reports/DepartmentTop10/index.php
    reports/GeneralDay/GeneralDayDiscountReport.php
    reports/GeneralDay/GeneralDayDiscountReportMP.php
    reports/GeneralDay/GeneralDayReport.php
    reports/GeneralDay/GeneralDayReport_assign_headers.php
    reports/GeneralRange/GeneralRangeNSReport.php
    reports/GeneralRange/GeneralRangeReport.php
    reports/GeneralRange/GeneralRangeReportMP.php
    reports/HouseCoupons/HouseCouponsReport.php
    reports/HouseCoupons/index.php
    reports/MarginMovement/MarginMovementReport.php
    reports/MembershipEntry/MembershipEntryReport.php
    reports/MembershipEntry/index.php
    reports/OrderingReport/OrderingReport.php
    reports/PatronageByOwner/index.php
    reports/PatronageByOwnerRange/PatronageByOwnerRange.php
    reports/PatronageByOwnerRange/index.php
    reports/PrepayStatus/PrepayStatusReport.php
    reports/PrepayStatus/index.php
    reports/Returns/ReturnsByReceipt.php
    reports/Returns/ReturnsReport.php
    reports/Returns/index.php
    reports/Store-Specific/WEFC_Toronto/PostalCode/PostalCodeReport.php
    reports/Store-Specific/WEFC_Toronto/PostalCode/Toronto_All_3-Char_Postal_Codes.gif
    reports/Store-Specific/WEFC_Toronto/PostalCode/Toronto_Central_3-Char_Postal_Codes.jpg
    reports/Store-Specific/WEFC_Toronto/PostalCode/index.php
    reports/StoreChargeStatus/StoreChargeStatusReport.php
    reports/StoreChargeStatus/index.php
    reports/StoreProgram/StoreProgramReport.php
    reports/StoreProgram/index.php
    reports/StoreSummary/README
    reports/StoreSummary/StoreSummaryDiscountReport.php
    reports/StoreSummary/StoreSummaryReport.php
    reports/SuspendedTransactions/SuspendedTransactionsReport.php
    reports/SuspendedTransactions/index.php
    reports/VendorMovement/VendorMovementReport.php
    flathat committed Sep 7, 2017
    Copy the full SHA
    5f00c06 View commit details
Showing 362 changed files with 50,370 additions and 962 deletions.
Loading